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.88 by pcg, Fri May 21 16:13:41 2004 UTC vs.
Revision 1.120 by root, Wed Jun 2 03:39:24 2004 UTC

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

Diff Legend

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