ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/kgsueme/kgsueme/game.pl
(Generate patch)

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.70 by pcg, Tue Jul 22 21:44:00 2003 UTC vs.
Revision 1.125 by root, Wed Jun 2 09:32:32 2004 UTC

1use utf8; 1use utf8;
2
3use Scalar::Util ();
4
5### GO CLOCK WIDGET #########################################################
2 6
3package game::goclock; 7package game::goclock;
4 8
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock 9# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked. 10# is completely borked.
7 11
8use Time::HiRes (); 12use Time::HiRes ();
9 13
10use KGS::Constants; 14use KGS::Constants;
11 15
12use base gtk::widget; 16use Glib::Object::Subclass
17 Gtk2::Label;
13 18
14sub new { 19sub INIT_INSTANCE {
15 my $class = shift; 20 my $self = shift;
16 my $self = $class->SUPER::new(@_);
17 21
18 $self->{widget} = new Gtk2::Label; 22 $self->signal_connect (destroy => sub { $_[0]->stop });
19 23
20 $self->{set} = sub { }; 24 $self->{set} = sub { };
21 $self->{format} = sub { "ERROR" }; 25 $self->{format} = sub { "???" };
26}
22 27
28sub FINALIZE_INSTANCE {
29 my $self = shift;
30
23 $self; 31 $self->stop;
24} 32}
25 33
26sub configure { 34sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_; 35 my ($self, $timesys, $main, $interval, $count) = @_;
28 36
29 if ($timesys == TIMESYS_ABSOLUTE) { 37 if ($timesys == TIMESYS_ABSOLUTE) {
30 $self->{set} = sub { $self->{time} = $_[0] }; 38 $self->{format} = sub {
31 $self->{format} = sub { util::format_time $_[0] }; 39 if ($_[0] < 0) {
40 "TIMEOUT";
41 } else {
42 util::format_time $_[0];
43 }
44 };
32 45
33 } elsif ($timesys == TIMESYS_BYO_YOMI) { 46 } elsif ($timesys == TIMESYS_BYO_YOMI) {
34 my $low = $interval * $count; 47 my $low = $interval * $count;
35 48
36 $self->{set} = sub { $self->{time} = $_[0] };
37
38 $self->{format} = sub { 49 $self->{format} = sub {
50 if ($_[0] < 0) {
51 "TIMEOUT";
39 if ($_[0] > $low) { 52 } elsif ($_[0] > $low) {
40 util::format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
41 } else { 54 } else {
42 sprintf "%s (%d)", 55 sprintf "%s (%d)",
43 util::format_time int (($_[0] - 1) % $interval + 1), 56 util::format_time int (($_[0] - 1) % $interval + 1),
44 ($_[0] - 1) / $interval; 57 ($_[0] - 1) / $interval;
45 } 58 }
46 }; 59 };
47 60
48 } elsif ($timesys == TIMESYS_CANADIAN) { 61 } elsif ($timesys == TIMESYS_CANADIAN) {
49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
50
51 $self->{format} = sub { 62 $self->{format} = sub {
63 if ($_[0] < 0) {
64 "TIMEOUT";
52 if (!$self->{moves}) { 65 } elsif (!$self->{moves}) {
53 util::format_time $_[0] - $low; 66 util::format_time $_[0] - $low;
54 } else { 67 } else {
55 my $time = int (($_[0] - 1) % $interval + 1); 68 my $time = int (($_[0] - 1) % $interval + 1);
56 69
57 sprintf "%s/%d =%d", 70 sprintf "%s/%d =%d",
58 util::format_time $time, 71 util::format_time $time,
59 $self->{moves}, 72 $self->{moves},
73 $self->{moves} > 1
60 $time / ($self->{moves} || 1); 74 ? $time / $self->{moves}
61 75 : $interval;
62 } 76 }
63 }; 77 };
64 78
65 } else { 79 } else {
66 # none, or unknown 80 # none, or unknown
67 $self->{set} = sub { };
68 $self->{format} = sub { "---" } 81 $self->{format} = sub { "-" }
69 } 82 }
70} 83}
71 84
72sub refresh { 85sub refresh {
73 my ($self, $timestamp) = @_; 86 my ($self, $timestamp) = @_;
74 my $timer = $self->{time} + $self->{start} - $timestamp; 87 my $timer = $self->{time} + $self->{start} - $timestamp;
75 88
76 # we round the timer value slightly... the protocol isn't exact anyways, 89 # we round the timer value slightly... the protocol isn't exact anyways,
77 # and this gives smoother timers ;) 90 # and this gives smoother timers ;)
78 my @format = $self->{format}->(int ($timer + 0.4)); 91 my $timer2 = int $timer + 0.4;
92
79 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); 93 $self->set_text ($self->{format}->($timer2));
80 94
81 $timer - int $timer; 95 $timer - int $timer;
82} 96}
83 97
84sub set_time { 98sub set_time {
85 my ($self, $time) = @_; 99 my ($self, $start, $time, $moves) = @_;
86 100
87 # we ignore requests to re-set the time of a running clock. 101 $self->{time} = $time;
88 # this is the easiest way to ensure that commentary etc. 102 $self->{moves} = $moves;
89 # doesn't re-set the clock. yes, this is frickle design, 103
90 # but I think the protocol is to blame here, which gives 104 if ($start) {
91 # very little time information. (cgoban2 also has had quite 105 $self->{start} = $start;
92 # a lot of small time update problems...) 106 $self->start;
93 unless ($self->{timeout}) { 107 } else {
94 $self->{set}->($time->[0], $time->[1]); 108 $self->stop;
95 $self->refresh ($self->{start}); 109 $self->refresh ($self->{start});
96 } 110 }
97} 111}
98 112
99sub start { 113sub start {
100 my ($self, $when) = @_; 114 my ($self) = @_;
101 115
102 $self->stop; 116 $self->stop;
103
104 $self->{start} = $when;
105 117
106 my $timeout; $timeout = sub { 118 my $timeout; $timeout = sub {
107 my $next = $self->refresh (Time::HiRes::time) * 1000; 119 my $next = $self->refresh (Time::HiRes::time) * 1000;
108 $next += 1000 if $next < 0; 120 $next += 1000 if $next < 0;
109 $self->{timeout} = add Glib::Timeout $next, $timeout; 121 $self->{timeout} = add Glib::Timeout $next, $timeout;
… …
117 my ($self) = @_; 129 my ($self) = @_;
118 130
119 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 131 remove Glib::Source delete $self->{timeout} if $self->{timeout};
120} 132}
121 133
122sub destroy { 134### USER PANEL ##############################################################
123 my ($self) = @_;
124 $self->stop;
125 $self->SUPER::destroy;
126}
127 135
128package game::userpanel; 136package game::userpanel;
129 137
130use base gtk::widget; 138use KGS::Constants;
131 139
132sub new { 140use Glib::Object::Subclass
133 my $class = shift; 141 Gtk2::Frame,
134 my $self = $class->SUPER::new(@_); 142 properties => [
143 Glib::ParamSpec->IV ("colour", "colour", "User Colour",
144 COLOUR_BLACK, COLOUR_WHITE, COLOUR_BLACK,
145 [qw(construct-only readable writable)]),
146 ];
135 147
136 $self->{widget} = new Gtk2::HBox; 148sub INIT_INSTANCE {
149 my ($self) = @_;
137 150
138 $self->{widget}->add (my $vbox = new Gtk2::VBox); 151 $self->add (my $vbox = new Gtk2::VBox);
139 152
140 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 153 $vbox->pack_start (($self->{name} = new Gtk2::Label "-"), 1, 1, 0);
141 $vbox->add ($self->{info} = new Gtk2::Label ""); 154 $vbox->pack_start (($self->{info} = new Gtk2::Label "-"), 1, 1, 0);
142 $vbox->add (($self->{clock} = new game::goclock)->widget); 155 $vbox->pack_start (($self->{clock} = new game::goclock), 1, 1, 0);
143 156
144 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 157 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
145 158
146 $self; 159 $self;
147} 160}
… …
171 } 184 }
172 185
173 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); 186 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
174} 187}
175 188
176sub set_state { 189sub set_captures {
177 my ($self, $captures, $timer, $when) = @_; 190 my ($self, $captures) = @_;
178
179 $self->{clock}->stop unless $when;
180 $self->{clock}->set_time ($timer);
181 $self->{clock}->start ($when) if $when;
182 191
183 $self->{info}->set_text ("$captures pris."); 192 $self->{info}->set_text ("$captures pris.");
184} 193}
185 194
195sub set_timer {
196 my ($self, $start, $time, $moves) = @_;
197
198 $self->{clock}->set_time ($start, $time, $moves);
199}
200
201### GAME WINDOW #############################################################
202
186package game; 203package game;
204
205use Scalar::Util qw(weaken);
187 206
188use KGS::Constants; 207use KGS::Constants;
189use KGS::Game::Board; 208use KGS::Game::Board;
190 209
210use Gtk2::GoBoard;
211use Gtk2::GoBoard::Constants;
212
213use base KGS::Game;
191use base KGS::Listener::Game; 214use base KGS::Listener::Game;
192use base KGS::Game;
193 215
194use base gtk::widget; 216use Glib::Object::Subclass
217 Gtk2::Window;
195 218
196use POSIX qw(ceil); 219use POSIX qw(ceil);
197 220
198sub new { 221sub new {
199 my $self = shift; 222 my ($self, %arg) = @_;
200 $self = $self->SUPER::new(@_);
201 223
202 $self->listen($self->{conn}); 224 $self = $self->Glib::Object::new;
225 $self->{$_} = delete $arg{$_} for keys %arg;
203 226
204 $self->{window} = new Gtk2::Window 'toplevel';
205 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 227 gtk::state $self, "game::window", undef, window_size => [620, 460];
206 228
207 $self->{window}->signal_connect(delete_event => sub { 229 $self->signal_connect (destroy => sub {
208 $self->part; 230 $self->unlisten;
209 $self->destroy; 231 delete $self->{app}{game}{$self->{channel}};
210 1; 232 %{$_[0]} = ();
211 }); 233 });#d#
212 234
213 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 235 $self->add (my $hpane = new Gtk2::HPaned);
214 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 236 gtk::state $hpane, "game::hpane", undef, position => 420;
215 237
216 # LEFT PANE 238 # LEFT PANE
217 239
218 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 240 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
219 241
220 $self->{boardbox} = new Gtk2::VBox;
221
222 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 242 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
223 243
224 # challenge
225
226 $self->{challenge} = new challenge channel => $self->{channel};
227
228 # board box (aspect/canvas) 244 # board box (aspect/canvas)
229 245
246 # RIGHT PANE
247
248 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
249 $hpane->set (position_set => 1);
250
230 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 251 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
231 252
232 { 253 {
233 $frame->add (my $vbox = new Gtk2::VBox); 254 $frame->add (my $vbox = new Gtk2::VBox);
234 $vbox->add ($self->{title} = new Gtk2::Label $title); 255 $vbox->add ($self->{title} = new Gtk2::Label "-");
235 256
236 $vbox->add (my $hbox = new Gtk2::HBox); 257 $vbox->add (my $hbox = new Gtk2::HBox);
237 258
238 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0); 259 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 0, 0);
239 260
240 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 261 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
241 262
242 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); 263 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
243 $scale->set_draw_value (0); 264 $scale->set_draw_value (0);
244 $scale->set_digits (0); 265 $scale->set_digits (0);
245 266
246 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 267 $self->{moveadj}->signal_connect (value_changed => sub {
268 $self->{showmove} = int $self->{moveadj}->get_value;
269 $self->update_board;
270 });
247 } 271 }
248 272
249 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
250
251 # RIGHT PANE
252
253 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
254 $self->{hpane}->set(position_set => 1);
255 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
256
257 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
258 $sw->set_policy("automatic", "always");
259
260 $sw->add(($self->{userlist} = new userlist)->widget);
261
262 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
263
264 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 273 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
274
265 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 275 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
266 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 276 for COLOUR_WHITE, COLOUR_BLACK;
277
278 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
279
280 $buttonbox->add ($self->{button_pass} =
281 Gtk2::Button->Glib::Object::new (label => "Pass", visible => 0));
282 $self->{button_pass}->signal_connect (clicked => sub {
283 $self->{board_click}->(255, 255) if $self->{board_click};
284 });
285 eval { $self->{button_pass}->set (no_show_all => 1) }; # workaround for gtk+-2.2
286 $buttonbox->add ($self->{button_undo} =
287 Gtk2::Button->Glib::Object::new (label => "Undo", visible => 0));
288 $self->{button_undo}->signal_connect (clicked => sub {
289 $self->send (req_undo => channel => $self->{channel});
290 });
291 eval { $self->{button_undo}->set (no_show_all => 1) }; # workaround for gtk+-2.2
292 $buttonbox->add ($self->{button_resign} =
293 Gtk2::Button->Glib::Object::new (label => "Resign", visible => 0));
294 $self->{button_resign}->signal_connect (clicked => sub {
295 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
296 });
297 eval { $self->{button_resign}->set (no_show_all => 1) }; # workaround for gtk+-2.2
267 298
268 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 299 $vbox->pack_start (($self->{chat} = new chat), 1, 1, 0);
269 300
270 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 301 $self->set_channel ($self->{channel});
302
303 $self->show_all;
304
305 $self;
306}
307
308sub set_channel {
309 my ($self, $channel) = @_;
310
311 $self->{channel} = $channel;
312
313 if ($self->{channel} > 0) {
314 $self->listen ($self->{conn});
315
316 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
317 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
318
319 $self->signal_connect (delete_event => sub { $self->part; 1 });
271 $self->{entry}->signal_connect(activate => sub { 320 $self->{chat}->signal_connect (command => sub {
272 my $text = $self->{entry}->get_text; 321 my ($chat, $cmd, $arg) = @_;
273 $self->say($text) if $text =~ /\S/; 322 if ($cmd eq "rsave") {
274 $self->{entry}->set_text(""); 323 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
324 } else {
325 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
326 }
275 }); 327 });
328 }
329}
276 330
331### JOIN/LEAVE ##############################################################
332
333sub join {
334 my ($self) = @_;
335 return if $self->{joined};
336
337 $self->SUPER::join;
338}
339
340sub part {
341 my ($self) = @_;
342
343 $self->hide;
344 $self->SUPER::part;
345}
346
347sub event_join {
348 my ($self) = @_;
349
350 $self->SUPER::event_join (@_);
351 $self->init_tree;
277 $self->event_update_game; 352 $self->event_update_game;
278 $self; 353}
354
355sub event_part {
356 my ($self) = @_;
357
358 $self->SUPER::event_part;
359 $self->destroy;
360}
361
362sub event_quit {
363 my ($self) = @_;
364
365 $self->SUPER::event_quit;
366 $self->destroy;
367}
368
369### USERS ###################################################################
370
371sub draw_users {
372 my ($self, $inlay) = @_;
373
374 for (sort keys %{$self->{users}}) {
375 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
376 }
279} 377}
280 378
281sub event_update_users { 379sub event_update_users {
282 my ($self, $add, $update, $remove) = @_; 380 my ($self, $add, $update, $remove) = @_;
283 381
284 return unless $self->{userlist};
285
286 $self->{userlist}->update ($add, $update, $remove); 382# $self->{userlist}->update ($add, $update, $remove);
383
384 $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
385 for @$remove;
386
387 $self->{users_inlay}->refresh;
287 388
288 my %important; 389 my %important;
390 $important{$self->{black}{name}}++;
391 $important{$self->{white}{name}}++;
289 $important{$self->{user1}{name}}++; 392 $important{$self->{owner}{name}}++;
290 $important{$self->{user2}{name}}++;
291 $important{$self->{user3}{name}}++;
292 393
293 if (my @users = grep $important{$_->{name}}, @$add) { 394 if (my @users = grep $important{$_->{name}}, @$add) {
294 $self->{text}->append_text ("\n<header>Joins:</header>"); 395 $self->{chat}->append_text ("\n<leader>Joins:</leader>");
295 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 396 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
296 } 397 }
297 if (my @users = grep $important{$_->{name}}, @$remove) { 398 if (my @users = grep $important{$_->{name}}, @$remove) {
298 $self->{text}->append_text ("\n<header>Parts:</header>"); 399 $self->{chat}->append_text ("\n<leader>Parts:</leader>");
299 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 400 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
300 } 401 }
301
302} 402}
303 403
304sub join { 404### GAME INFO ###############################################################
405
406sub draw_setup {
305 my ($self) = @_; 407 my ($self, $inlay) = @_;
408
306 return if $self->{joined}; 409 return unless $self->{joined};
307 410
308 $self->SUPER::join; 411 my $rules = $self->{rules};
309 412
413 my $text = "";
414
415 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
416 if $self->{teacher};
417
418 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
419 if $self->{owner}->is_valid;
420
421 if ($self->is_inprogress) {
422 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
423 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
424 }
425 $text .= "\nType: " . util::toxml $gametype{$self->type};
426
427 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
428
429 $text .= "\nTime: ";
430
431 if ($rules->{timesys} == TIMESYS_NONE) {
432 $text .= "UNLIMITED";
433 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
434 $text .= util::format_time $rules->{time};
435 $text .= " ABS";
436 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
437 $text .= util::format_time $rules->{time};
438 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
439 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
440 $text .= util::format_time $rules->{time};
441 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
442 }
443
444 $text .= "\nFlags:";
445 $text .= " private" if $self->is_private;
446 $text .= " started" if $self->is_inprogress;
447 $text .= " adjourned" if $self->is_adjourned;
448 $text .= " scored" if $self->is_scored;
449 $text .= " saved" if $self->is_saved;
450
451 if ($self->is_inprogress) {
452 $text .= "\nHandicap: " . $self->{handicap};
453 $text .= "\nKomi: " . $self->{komi};
454 $text .= "\nSize: " . $self->size_string;
455 }
456
457 if ($self->is_scored) {
458 $text .= "\nResult: " . $self->score_string;
459 }
460
461 $inlay->append_text ("<infoblock>$text</infoblock>");
462
463}
464
465sub event_update_game {
466 my ($self) = @_;
467
468 $self->SUPER::event_update_game;
469
470 return unless $self->{joined};
471
472 $self->{colour} = $self->player_colour ($self->{conn}{name});
473
474 $self->{user}[COLOUR_BLACK] = $self->{black};
475 $self->{user}[COLOUR_WHITE] = $self->{white};
476
477 # show board
478 if ($self->is_inprogress) {
479 if (!$self->{board}) {
480 $self->{left}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
481 $self->{board}->signal_connect (button_release => sub {
482 return unless $self->{cur_board};
483 if ($_[1] == 1) {
484 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
485 }
486 });
310 $self->{window}->show_all; 487 $self->{board}->show_all;
311} 488 }
489 if (my $ch = delete $self->{challenge}) {
490 $_->{inlay}->destroy for values %$ch;
491 }
492 $self->update_cursor;
493 }
312 494
313sub part { 495 my $title = defined $self->{channel}
496 ? $self->owner->as_string . " " . $self->opponent_string
497 : "Game Window";
498 $self->set_title ("KGS Game $title");
499 $self->{title}->set_text ($title); # title gets redrawn wrongly
500
501 $self->{rules_inlay}->refresh;
502
503 if (exists $self->{teacher}) {
504 $self->{teacher_inlay} ||= $self->{chat}->new_inlay;
505 $self->{teacher_inlay}->clear;
506 $self->{teacher_inlay}->append_text ("\n<header>Teacher:</header> <user>"
507 . (util::toxml $self->{teacher}) . "</user>");
508 } elsif ($self->{teacher_inlay}) {
509 (delete $self->{teacher_inlay})->clear;
510 }
511
512 $self->update_cursor;
513}
514
515sub event_update_rules {
516 my ($self, $rules) = @_;
517
518 $self->{rules} = $rules;
519
520 if ($self->{user}) {
521 # todo. gets drawn wrongly
522
523 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
524 for COLOUR_BLACK, COLOUR_WHITE;
525 }
526
527 sound::play 3, "gamestart";
528 $self->{rules_inlay}->refresh;
529}
530
531### BOARD DISPLAY ###########################################################
532
533sub update_timers {
534 my ($self, $timers) = @_;
535
536 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
537
538 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
539 my $t = $timers->[$colour];
540 $self->{userpanel}[$colour]->set_timer (
541 $running && $colour == $self->{whosemove} && $t->[0],
542 $t->[1] || $self->{rules}{time}
543 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
544 && $self->{rules}{interval} * $self->{rules}{count}),
545 $t->[2]);
546 }
547}
548
549sub inject_set_gametime {
314 my ($self) = @_; 550 my ($self, $msg) = @_;
315 551
316 $self->SUPER::part; 552 $self->{timers} = [
317 $self->destroy; 553 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
554 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
555 ];
556
557 $self->update_timers ($self->{timers})
558 if $self->{showmove} == @{$self->{path}};
559}
560
561sub update_cursor {
562 my ($self) = @_;
563
564 return unless $self->{cur_board};
565
566 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
567
568 delete $self->{board_click};
569
570 if ($self->{teacher} eq $self->{app}{conn}) {
571 #TODO# # teaching mode not implemented
572 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
573 $self->{button_undo}->hide;
574 $self->{button_resign}->hide;
575 $self->{board}->set (cursor => undef);
576
577 } elsif ($running && $self->{colour} != COLOUR_NONE) {
578 # during game
579 $self->{button_undo}->show;
580 $self->{button_resign}->show;
581
582 if ($self->{cur_board}{score}) {
583 # during scoring
584 $self->{button_pass}->set (label => "Done", visible => 1, sensitive => 1);
585 $self->{board}->set (cursor => sub {
586 $_[0] & (MARK_B | MARK_W)
587 ? $_[0] ^ MARK_GRAYED
588 : $_[0];
589 });
590 $self->{board_click} = sub {
591 if ($_[0] == 255) {
592 $self->{button_pass}->sensitive (0);
593 $self->done;
594 } else {
595 $self->send (mark_dead =>
596 channel => $self->{channel},
597 x => $_[0],
598 y => $_[1],
599 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
600 );
601 }
602 };
603
604 } elsif ($self->{colour} == $self->{whosemove}) {
605 # normal move
606 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
607 $self->{board}->set (cursor => sub {
608 $self->{cur_board}
609 && $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
610 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
611 ? $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
612 : $_[0];
613 });
614 $self->{board_click} = sub {
615 return unless
616 $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
617 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND);
618 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
619 $self->{board}->set (cursor => undef);
620 delete $self->{board_click};
621 $self->{button_pass}->sensitive (0);
622 };
623 } else {
624 $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
625 $self->{board}->set (cursor => undef);
626 }
627 } else {
628 $self->{button_undo}->hide;
629 $self->{button_resign}->hide;
630 $self->{button_pass}->hide;
631 $self->{board}->set (cursor => undef);
632 #TODO# # implement coordinate-grabbing
633 }
318} 634}
319 635
320sub update_board { 636sub update_board {
321 my ($self) = @_; 637 my ($self) = @_;
638
322 return unless $self->{path}; 639 return unless $self->{path};
323 640
324 my $move = int $self->{moveadj}->get_value;
325
326 my $running = $move == @{$self->{path}};
327
328 $self->{board_label}->set_text ("Move " . ($move - 1)); 641 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
329 642
330 $self->{cur_board} = new KGS::Game::Board $self->{size}; 643 $self->{cur_board} = new KGS::Game::Board $self->{size};
331 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 644 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
332 645
333 for my $colour (WHITE, BLACK) { 646 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
334 $self->{userpanel}[$colour]->set_state ( 647 if ($self->{curnode}{move} == 0) {
335 $self->{cur_board}{captures}[$colour], 648 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
649 } else {
650 $self->{whosemove} = 1 - $self->{cur_board}{last};
651 }
652 } else {
653 # Chinese, Aga, NZ all have manual placement
654 if ($self->{curnode}{move} < $self->{handicap}) {
655 $self->{whosemove} = COLOUR_BLACK;
656 } elsif ($self->{curnode}{move} == $self->{handicap}) {
657 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
658 } else {
659 $self->{whosemove} = 1 - $self->{cur_board}{last};
660 }
661 }
662
663 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
664 for COLOUR_WHITE, COLOUR_BLACK;
665
666 my $start_time = $self->{rules}{time};
667
668 if ($self->{showmove} == @{$self->{path}}) {
669 $self->{timers} = [
670 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
671 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
672 ];
673 $self->update_timers ($self->{timers});
674 } else {
675 $self->update_timers ([
336 $self->{cur_board}{timer}[$colour], 676 [0, @{$self->{cur_board}{timer}[0]}],
337 ($running && $self->{lastmove_colour} == !$colour) 677 [0, @{$self->{cur_board}{timer}[1]}],
338 ? $self->{lastmove_time} : 0
339 ); 678 ]);
340 } 679 }
341 680
342 $self->{board}->set_board ($self->{cur_board}); 681 $self->{board}->set_board ($self->{cur_board});
682
683 if ($self->{cur_board}{score}) {
684 $self->{score_inlay} ||= $self->{chat}->new_inlay;
685 $self->{score_inlay}->clear;
686 $self->{score_inlay}->append_text ("\n<header>Scoring</header>"
687 . "\n<score>"
688 . "White: $self->{cur_board}{score}[COLOUR_WHITE], "
689 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
690 . "</score>");
691 } elsif ($self->{score_inlay}) {
692 (delete $self->{score_inlay})->clear;
693 }
694
695 $self->update_cursor;
696
343} 697}
344 698
345sub event_update_tree { 699sub event_update_tree {
346 my ($self) = @_; 700 my ($self) = @_;
701
702 (delete $self->{undo_inlay})->clear
703 if $self->{undo_inlay};
347 704
348 $self->{path} = $self->get_path; 705 $self->{path} = $self->get_path;
349 706
350 if ($self->{moveadj}) { 707 if ($self->{moveadj}) {
351 my $upper = $self->{moveadj}->upper; 708 my $upper = $self->{moveadj}->upper;
… …
394 }sgexi; 751 }sgexi;
395 752
396 $text .= $_; 753 $text .= $_;
397 } 754 }
398 755
399 $self->{text}->append_text ($text); 756 $self->{chat}->append_text ($text);
400}
401
402sub event_join {
403 my ($self) = @_;
404 $self->SUPER::event_join;
405}
406
407sub event_part {
408 my ($self) = @_;
409 $self->SUPER::event_part;
410 $self->destroy;
411} 757}
412 758
413sub event_move { 759sub event_move {
414 my ($self, $pass) = @_; 760 my ($self, $pass) = @_;
761
415 sound::play 1, $pass ? "pass" : "move"; 762 sound::play 1, $pass ? "pass" : "move";
416} 763}
417 764
418sub event_update_game { 765### GAMEPLAY EVENTS #########################################################
419 my ($self) = @_;
420 $self->SUPER::event_update_game;
421 766
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
484sub 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
514sub inject_resign_game { 767sub event_resign_game {
515 my ($self, $msg) = @_; 768 my ($self, $player) = @_;
516 769
517 sound::play 3, "resign"; 770 sound::play 3, "resign";
518
519 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 771 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
520 . "\n<user>" 772 . "\n<user>"
521 . (util::toxml $self->{user}[$msg->{player}]->as_string) 773 . (util::toxml $self->{user}[$msg->{player}]->as_string)
522 . "</user> resigned.</infoblock>"); 774 . "</user> resigned."
775 . "\n<user>"
776 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
777 . "</user> wins the game."
778 . "</infoblock>");
779}
780
781sub event_time_win {
782 my ($self, $player) = @_;
783
784 sound::play 3, "timewin";
785 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
786 . "\n<user>"
787 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
788 . "</user> ran out of time and lost."
789 . "\n<user>"
790 . (util::toxml $self->{user}[$msg->{player}]->as_string)
791 . "</user> wins the game."
792 . "</infoblock>");
793}
794
795sub event_owner_left {
796 my ($self) = @_;
797
798 $self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
799 . "\nThe owner of this game left.</infoblock>");
800}
801
802sub event_teacher_left {
803 my ($self) = @_;
804
805 $self->{chat}->append_text ("\n<infoblock><header>Teacher left</header>"
806 . "\nThe teacher left the game.</infoblock>");
807}
808
809sub event_done {
810 my ($self) = @_;
811
812 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
813 sound::play 2, "info" unless $inlay->{count};
814 $self->{chat}->append_text ("\n<infoblock><header>Press Done</header>"
815 . "\nYour opponent pressed done. Now it's up to you.");
816 }
817 if ($self->{doneid} & 0x80000000) {
818 sound::play 2, "info" unless $inlay->{count};
819 $self->{chat}->append_text ("\n<infoblock><header>Press Done Again</header>"
820 . "\nThe board has changed.");
821 }
822
823 $self->{button_pass}->sensitive (!$self->{done}[$self->{colour}]);
824
825 $self->{chat}->set_end;
523} 826}
524 827
525sub inject_final_result { 828sub inject_final_result {
526 my ($self, $msg) = @_; 829 my ($self, $msg) = @_;
527 830
528 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 831 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
529 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 832 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
530 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 833 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
531 . "</infoblock>" 834 . "</infoblock>"
532 ); 835 );
533} 836}
534 837
838sub inject_req_undo {
839 my ($self, $msg) = @_;
840
841 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
842 return if $inlay->{ignore};
843
844 sound::play 2, "warning" unless $inlay->{count};
845 $inlay->{count}++;
846
847 $inlay->clear;
848 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
849 $inlay->append_button ("Grant", sub {
850 (delete $self->{undo_inlay})->clear;
851 $self->send (grant_undo => channel => $self->{channel});
852 });
853 $inlay->append_button ("Ignore", sub {
854 $inlay->clear;
855 $inlay->{ignore} = 1;
856 # but leave inlay, so further undo requests get counted
857 });
858
859 $self->{chat}->set_end;
860}
861
862sub inject_new_game {
863 my ($self, $msg) = @_;
864
865 if ($msg->{cid} != $self->{cid}) {
866 $self->part;
867 warn "ERROR: challenge id mismatch, PLEASE REPORT, especially the circumstances (many games open? etc..)\n";#d#
868 }
869
870 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
871 delete $self->{cid};
872}
873
874### CHALLENGE HANDLING ######################################################
875
876sub draw_challenge {
877 my ($self, $id) = @_;
878
879 my $info = $self->{challenge}{$id};
880 my $inlay = $info->{inlay};
881 my $rules = $info->{rules};
882
883 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
884 my $opponent = $as_black ? $info->{white} : $info->{black};
885
886 my ($size, $time, $interval, $count, $type);
887
888 if (!$self->{channel}) {
889 $inlay->append_text ("\nNotes: ");
890 $inlay->append_widget (gtk::textentry \$info->{notes}, 20, "");
891 $inlay->append_text ("\nGlobal Offer: ");
892 $inlay->append_optionmenu (\$info->{flags},
893 0 => "No",
894 2 => "Yes",
895 );
896 } else {
897 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
898 }
899
900 $inlay->append_text ("\nType: ");
901 $type = $inlay->append_optionmenu (
902 \$info->{gametype},
903 GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
904 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
905 GAMETYPE_TEACHING , "Teaching (not yet)",
906 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
907 GAMETYPE_SIMUL , "Simul (not yet!)",
908 GAMETYPE_FREE , "Free",
909 GAMETYPE_RATED , "Rated",
910 sub {
911 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
912 },
913 );
914
915 if ($self->{channel}) {
916 $inlay->append_text ("\nMy Colour: ");
917 $inlay->append_optionmenu (
918 \$as_black,
919 0 => "White",
920 1 => "Black",
921 sub {
922 if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
923 ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
924 }
925 }
926 );
927 }
928
929 $inlay->append_text ("\nRuleset: ");
930 $inlay->append_optionmenu (
931 \$info->{rules}{ruleset},
932 RULESET_JAPANESE , "Japanese",
933 RULESET_CHINESE , "Chinese",
934 RULESET_AGA , "AGA",
935 RULESET_NEW_ZEALAND, "New Zealand",
936 );
937
938 $inlay->append_text ("\nSize: ");
939 $size = $inlay->append_optionmenu (
940 \$info->{rules}{size},
941 (9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38),
942 sub {
943 $type->set_history (5) # reset to free
944 if $_[0] != 19 && $info->{gametype} == GAMETYPE_RATED;
945 },
946 );
947
948 if ($self->{channel}) {
949 $inlay->append_text ("\nHandicap: ");
950 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
951
952 $inlay->append_text ("\nKomi: ");
953 $inlay->append_widget (gtk::numentry \$info->{rules}{komi}, 5);
954 }
955
956 $inlay->append_text ("\nTimesys: ");
957 $inlay->append_optionmenu (
958 \$info->{rules}{timesys},
959 &TIMESYS_NONE => "None",
960 &TIMESYS_ABSOLUTE => "Absolute",
961 &TIMESYS_BYO_YOMI => "Byo Yomi",
962 &TIMESYS_CANADIAN => "Canadian",
963 sub {
964 my ($new) = @_;
965
966 if ($new eq TIMESYS_NONE) {
967 $time->hide;
968 $interval->hide;
969 $count->hide;
970 } else {
971 $time->show;
972 $time->set_text ($self->{app}{defaults}{time});
973 if ($new eq TIMESYS_ABSOLUTE) {
974 $interval->hide;
975 $count->hide;
976 } else {
977 $interval->show;
978 $count->show;
979 if ($new eq TIMESYS_BYO_YOMI) {
980 $interval->set_text ($self->{app}{defaults}{byo_time});
981 $count->set_text ($self->{app}{defaults}{byo_period});
982 } elsif ($new eq TIMESYS_CANADIAN) {
983 $interval->set_text ($self->{app}{defaults}{can_time});
984 $count->set_text ($self->{app}{defaults}{can_period});
985 }
986 }
987 }
988 }
989 );
990
991 $inlay->append_text ("\nMain Time: ");
992 $time = $inlay->append_widget (gtk::timeentry \$info->{rules}{time}, 5);
993 $inlay->append_text ("\nInterval: ");
994 $interval = $inlay->append_widget (gtk::timeentry \$info->{rules}{interval}, 5);
995 $inlay->append_text ("\nPeriods/Stones: ");
996 $count = $inlay->append_widget (gtk::numentry \$info->{rules}{count}, 5);
997
998 $inlay->append_text ("\n");
999
1000 if (!$self->{channel}) {
1001 $inlay->append_button ("Create Challenge", sub {
1002 $inlay->clear;
1003 $self->{cid} = $self->{conn}->alloc_clientid;
1004 $self->send (new_game =>
1005 channel => delete $self->{roomid},
1006 gametype => $info->{gametype},
1007 cid => $self->{cid},
1008 flags => $info->{flags},
1009 rules => $info->{rules},
1010 notes => $info->{notes},
1011 );
1012 });
1013 } else {
1014 $inlay->append_button ("OK", sub {
1015 $inlay->clear;
1016 $self->send (challenge =>
1017 channel => $self->{channel},
1018 black => $info->{black},
1019 white => $info->{white},
1020 gametype => $info->{gametype},
1021 cid => $info->{cid},
1022 rules => $info->{rules},
1023 );
1024 });
1025 if (exists $self->{challenge}{""}) {
1026 $inlay->append_button ("Reject", sub {
1027 $inlay->clear;
1028 $self->send (reject_challenge =>
1029 channel => $self->{channel},
1030 name => $opponent->{name},
1031 gametype => $info->{gametype},
1032 cid => $info->{cid},
1033 rules => $info->{rules},
1034 );
1035 });
1036 }
1037 }
1038}
1039
1040sub new_game_challenge {
1041 my ($self) = @_;
1042
1043 my $d = $self->{app}{defaults};
1044
1045 $self->{challenge}{""} = {
1046 gametype => $d->{gametype},
1047 flags => 0,
1048 notes => $d->{stones},
1049 rules => {
1050 ruleset => $d->{ruleset},
1051 size => $d->{size},
1052 timesys => $d->{timesys},
1053 time => $d->{time},
1054 interval => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_time} : $d->{can_time},
1055 count => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_periods} : $d->{can_stones},
1056 },
1057
1058 inlay => $self->{chat}->new_inlay,
1059 };
1060 $self->draw_challenge ("");
1061}
1062
535sub event_challenge { 1063sub 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
542sub destroy {
543 my ($self) = @_; 1064 my ($self, $info) = @_;
544 1065
545 delete $self->{app}{gamelist}{game}{$self->{channel}}; 1066 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
546 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 1067 my $opponent = $as_black ? $info->{white} : $info->{black};
547 for BLACK, WHITE; 1068
548 $self->SUPER::destroy; 1069 my $id = $opponent->{name};
1070
1071 sound::play 2, "info";
1072
1073 $self->{challenge}{$id} = $info;
1074 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
1075 exists $self->{challenge}{""}
1076 ? "Challenge from " . $opponent->as_string
1077 : "Challenge to " . $opponent->as_string,
1078 sub {
1079 $self->{challenge}{$id}{inlay} = $_[0];
1080 $self->draw_challenge ($id);
1081 },
1082 !exists $self->{challenge}{""} # only open when not offerer
1083 );
549} 1084}
550 1085
5511; 10861;
552 1087

Diff Legend

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