… | |
… | |
55 | my $time = int (($_[0] - 1) % $interval + 1); |
55 | my $time = int (($_[0] - 1) % $interval + 1); |
56 | |
56 | |
57 | sprintf "%s/%d =%d", |
57 | sprintf "%s/%d =%d", |
58 | util::format_time $time, |
58 | util::format_time $time, |
59 | $self->{moves}, |
59 | $self->{moves}, |
|
|
60 | $self->{moves} > 1 |
60 | $time / ($self->{moves} || 1); |
61 | ? $time / $self->{moves} |
61 | |
62 | : $interval; |
62 | } |
63 | } |
63 | }; |
64 | }; |
64 | |
65 | |
65 | } else { |
66 | } else { |
66 | # none, or unknown |
67 | # none, or unknown |
… | |
… | |
186 | package game; |
187 | package game; |
187 | |
188 | |
188 | use KGS::Constants; |
189 | use KGS::Constants; |
189 | use KGS::Game::Board; |
190 | use KGS::Game::Board; |
190 | |
191 | |
|
|
192 | use Gtk2::GoBoard; |
|
|
193 | |
191 | use base KGS::Listener::Game; |
194 | use base KGS::Listener::Game; |
192 | use base KGS::Game; |
195 | use base KGS::Game; |
193 | |
196 | |
194 | use base gtk::widget; |
197 | use base gtk::widget; |
195 | |
198 | |
… | |
… | |
263 | |
266 | |
264 | $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); |
267 | $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); |
265 | $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); |
268 | $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); |
266 | $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); |
269 | $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); |
267 | |
270 | |
268 | $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); |
271 | $vbox->pack_start(($self->{chat} = new chat), 1, 1, 0); |
269 | |
272 | |
270 | $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); |
|
|
271 | $self->{entry}->signal_connect(activate => sub { |
273 | $self->{chat}->signal_connect(command => sub { |
272 | my $text = $self->{entry}->get_text; |
274 | my ($chat, $cmd, $arg) = @_; |
273 | $self->say($text) if $text =~ /\S/; |
275 | if ($cmd eq "rsave") { |
274 | $self->{entry}->set_text(""); |
276 | Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d# |
|
|
277 | } else { |
|
|
278 | $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self); |
|
|
279 | } |
275 | }); |
280 | }); |
276 | |
281 | |
277 | $self->event_update_game; |
282 | $self->event_update_game; |
278 | $self; |
283 | $self; |
279 | } |
284 | } |
280 | |
285 | |
281 | sub event_update_users { |
286 | sub event_update_users { |
282 | my ($self, $add, $update, $remove) = @_; |
287 | my ($self, $add, $update, $remove) = @_; |
|
|
288 | |
|
|
289 | return unless $self->{userlist}; |
283 | |
290 | |
284 | $self->{userlist}->update ($add, $update, $remove); |
291 | $self->{userlist}->update ($add, $update, $remove); |
285 | |
292 | |
286 | my %important; |
293 | my %important; |
287 | $important{$self->{user1}{name}}++; |
294 | $important{$self->{user1}{name}}++; |
288 | $important{$self->{user2}{name}}++; |
295 | $important{$self->{user2}{name}}++; |
289 | $important{$self->{user3}{name}}++; |
296 | $important{$self->{user3}{name}}++; |
290 | |
297 | |
291 | if (my @users = grep $important{$_->{name}}, @$add) { |
298 | if (my @users = grep $important{$_->{name}}, @$add) { |
292 | $self->{text}->append_text ("\n<header>Joins:</header>"); |
299 | $self->{chat}->append_text ("\n<header>Joins:</header>"); |
293 | $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
300 | $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
294 | } |
301 | } |
295 | if (my @users = grep $important{$_->{name}}, @$remove) { |
302 | if (my @users = grep $important{$_->{name}}, @$remove) { |
296 | $self->{text}->append_text ("\n<header>Parts:</header>"); |
303 | $self->{chat}->append_text ("\n<header>Parts:</header>"); |
297 | $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
304 | $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
298 | } |
305 | } |
299 | |
306 | |
300 | } |
307 | } |
301 | |
308 | |
302 | sub join { |
309 | sub join { |
… | |
… | |
392 | }sgexi; |
399 | }sgexi; |
393 | |
400 | |
394 | $text .= $_; |
401 | $text .= $_; |
395 | } |
402 | } |
396 | |
403 | |
397 | $self->{text}->append_text ($text); |
404 | $self->{chat}->append_text ($text); |
398 | } |
405 | } |
399 | |
406 | |
400 | sub event_join { |
407 | sub event_join { |
401 | my ($self) = @_; |
408 | my ($self) = @_; |
402 | $self->SUPER::event_join; |
409 | $self->SUPER::event_join; |
… | |
… | |
414 | } |
421 | } |
415 | |
422 | |
416 | sub event_update_game { |
423 | sub event_update_game { |
417 | my ($self) = @_; |
424 | my ($self) = @_; |
418 | $self->SUPER::event_update_game; |
425 | $self->SUPER::event_update_game; |
|
|
426 | |
|
|
427 | return unless $self->{window}; |
419 | |
428 | |
420 | my $title = defined $self->{channel} |
429 | my $title = defined $self->{channel} |
421 | ? $self->owner->as_string . " " . $self->opponent_string |
430 | ? $self->owner->as_string . " " . $self->opponent_string |
422 | : "Game Window"; |
431 | : "Game Window"; |
423 | $self->{window}->set_title("KGS Game $title"); |
432 | $self->{window}->set_title("KGS Game $title"); |
… | |
… | |
426 | $self->{user}[BLACK] = $self->{user1}; |
435 | $self->{user}[BLACK] = $self->{user1}; |
427 | $self->{user}[WHITE] = $self->{user2}; |
436 | $self->{user}[WHITE] = $self->{user2}; |
428 | |
437 | |
429 | # show board |
438 | # show board |
430 | |
439 | |
431 | $self->{left}->remove ($_) for $self->{left}->get_children; |
|
|
432 | if ($self->is_valid) { |
440 | if ($self->is_valid) { |
433 | $self->{left}->add ($self->{boardbox}); |
441 | $self->{left}->add ($self->{boardbox}); |
434 | (delete $self->{challenge})->destroy if $self->{challenge}; |
442 | $self->{left}->remove ($self->{challenge}->widget) if $self->{challenge}; |
435 | } else { |
443 | } else { |
436 | $self->{left}->add ($self->{challenge}->widget); |
444 | $self->{left}->add ($self->{challenge}->widget); |
|
|
445 | $self->{left}->remove ($self->{boardbox}); |
437 | } |
446 | } |
438 | $self->{left}->show_all; |
447 | $self->{left}->show_all; |
439 | |
448 | |
440 | # view text |
449 | # view text |
441 | |
450 | |
… | |
… | |
474 | $text .= "</infoblock>"; |
483 | $text .= "</infoblock>"; |
475 | |
484 | |
476 | $self->{gatext} = \@ga; |
485 | $self->{gatext} = \@ga; |
477 | }; |
486 | }; |
478 | |
487 | |
479 | $self->{text}->append_text ($text); |
488 | $self->{chat}->append_text ($text); |
480 | } |
489 | } |
481 | |
490 | |
482 | sub event_update_rules { |
491 | sub event_update_rules { |
483 | my ($self, $rules) = @_; |
492 | my ($self, $rules) = @_; |
484 | |
493 | |
… | |
… | |
504 | } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { |
513 | } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { |
505 | $text .= util::format_time $rules->{time}; |
514 | $text .= util::format_time $rules->{time}; |
506 | $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; |
515 | $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; |
507 | } |
516 | } |
508 | |
517 | |
509 | $self->{text}->append_text ("<infoblock>$text</infoblock>"); |
518 | $self->{chat}->append_text ("<infoblock>$text</infoblock>"); |
510 | } |
519 | } |
511 | |
520 | |
512 | sub inject_resign_game { |
521 | sub inject_resign_game { |
513 | my ($self, $msg) = @_; |
522 | my ($self, $msg) = @_; |
514 | |
523 | |
515 | sound::play 3, "resign"; |
524 | sound::play 3, "resign"; |
516 | |
525 | |
517 | $self->{text}->append_text ("\n<infoblock><header>Resign</header>" |
526 | $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" |
518 | . "\n<user>" |
527 | . "\n<user>" |
519 | . (util::toxml $self->{user}[$msg->{player}]->as_string) |
528 | . (util::toxml $self->{user}[$msg->{player}]->as_string) |
520 | . "</user> resigned.</infoblock>"); |
529 | . "</user> resigned.</infoblock>"); |
521 | } |
530 | } |
522 | |
531 | |
523 | sub inject_final_result { |
532 | sub inject_final_result { |
524 | my ($self, $msg) = @_; |
533 | my ($self, $msg) = @_; |
525 | |
534 | |
526 | $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" |
535 | $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>" |
527 | . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) |
536 | . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) |
528 | . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) |
537 | . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) |
529 | . "</infoblock>" |
538 | . "</infoblock>" |
530 | ); |
539 | ); |
531 | } |
540 | } |
532 | |
541 | |
533 | sub event_challenge { |
542 | sub event_challenge { |
534 | my ($self, $challenge) = @_; |
543 | my ($self, $challenge) = @_; |
535 | |
544 | |
536 | use KGS::Listener::Debug; |
545 | use KGS::Listener::Debug; |
537 | $self->{text}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); |
546 | $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); |
538 | } |
547 | } |
539 | |
548 | |
540 | sub destroy { |
549 | sub destroy { |
541 | my ($self) = @_; |
550 | my ($self) = @_; |
|
|
551 | |
|
|
552 | delete $self->{app}{gamelist}{game}{$self->{channel}}; |
542 | $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy |
553 | $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy |
543 | for BLACK, WHITE; |
554 | for BLACK, WHITE; |
544 | $self->SUPER::destroy; |
555 | $self->SUPER::destroy; |
545 | delete $self->{app}{gamelist}{game}{$self->{channel}}; |
|
|
546 | } |
556 | } |
547 | |
557 | |
548 | 1; |
558 | 1; |
549 | |
559 | |