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

Diff Legend

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