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.110 by root, Mon May 31 17:06:19 2004 UTC vs.
Revision 1.117 by root, Tue Jun 1 21:24:11 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.
… …
32sub configure { 34sub configure {
33 my ($self, $timesys, $main, $interval, $count) = @_; 35 my ($self, $timesys, $main, $interval, $count) = @_;
34 36
35 if ($timesys == TIMESYS_ABSOLUTE) { 37 if ($timesys == TIMESYS_ABSOLUTE) {
36 $self->{format} = sub { 38 $self->{format} = sub {
37 if ($_[0] <= 0) { 39 if ($_[0] < 0) {
38 "TIMEOUT"; 40 "TIMEOUT";
39 } else { 41 } else {
40 util::format_time $_[0]; 42 util::format_time $_[0];
41 } 43 }
42 }; 44 };
43 45
44 } elsif ($timesys == TIMESYS_BYO_YOMI) { 46 } elsif ($timesys == TIMESYS_BYO_YOMI) {
45 my $low = $interval * $count; 47 my $low = $interval * $count;
46 48
47 $self->{format} = sub { 49 $self->{format} = sub {
48 if ($_[0] <= 0) { 50 if ($_[0] < 0) {
49 "TIMEOUT"; 51 "TIMEOUT";
50 } elsif ($_[0] > $low) { 52 } elsif ($_[0] > $low) {
51 util::format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
52 } else { 54 } else {
53 sprintf "%s (%d)", 55 sprintf "%s (%d)",
… …
56 } 58 }
57 }; 59 };
58 60
59 } elsif ($timesys == TIMESYS_CANADIAN) { 61 } elsif ($timesys == TIMESYS_CANADIAN) {
60 $self->{format} = sub { 62 $self->{format} = sub {
61 if ($_[0] <= 0) { 63 if ($_[0] < 0) {
62 "TIMEOUT"; 64 "TIMEOUT";
63 } elsif (!$self->{moves}) { 65 } elsif (!$self->{moves}) {
64 util::format_time $_[0] - $low; 66 util::format_time $_[0] - $low;
65 } else { 67 } else {
66 my $time = int (($_[0] - 1) % $interval + 1); 68 my $time = int (($_[0] - 1) % $interval + 1);
… …
127 my ($self) = @_; 129 my ($self) = @_;
128 130
129 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 131 remove Glib::Source delete $self->{timeout} if $self->{timeout};
130} 132}
131 133
134### USER PANEL ##############################################################
135
132package game::userpanel; 136package game::userpanel;
133 137
138use KGS::Constants;
139
134use Glib::Object::Subclass 140use Glib::Object::Subclass
135 Gtk2::HBox, 141 Gtk2::Frame,
136 properties => [ 142 properties => [
137 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)]),
138 ]; 146 ];
139 147
140sub INIT_INSTANCE { 148sub INIT_INSTANCE {
141 my ($self) = @_; 149 my ($self) = @_;
142 150
143 $self->add (my $vbox = new Gtk2::VBox); 151 $self->add (my $vbox = new Gtk2::VBox);
144 152
145 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 153 $vbox->pack_start (($self->{name} = new Gtk2::Label "-"), 1, 1, 0);
146 $vbox->add ($self->{info} = new Gtk2::Label ""); 154 $vbox->pack_start (($self->{info} = new Gtk2::Label "-"), 1, 1, 0);
147 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock}; 155 $vbox->pack_start (($self->{clock} = new game::goclock), 1, 1, 0);
148 156
149 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 157 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
150 158
151 $self; 159 $self;
152} 160}
… …
188 my ($self, $start, $time, $moves) = @_; 196 my ($self, $start, $time, $moves) = @_;
189 197
190 $self->{clock}->set_time ($start, $time, $moves); 198 $self->{clock}->set_time ($start, $time, $moves);
191} 199}
192 200
201### GAME WINDOW #############################################################
202
193package game; 203package game;
194 204
195use Scalar::Util qw(weaken); 205use Scalar::Util qw(weaken);
196 206
197use KGS::Constants; 207use KGS::Constants;
… …
226 236
227 # LEFT PANE 237 # LEFT PANE
228 238
229 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0); 239 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
230 240
231 $self->{boardbox} = new Gtk2::VBox;
232
233 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 241 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
234 242
235 # board box (aspect/canvas) 243 # board box (aspect/canvas)
236 244
237 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
238
239 # RIGHT PANE 245 # RIGHT PANE
240 246
241 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1); 247 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
242 $hpane->set (position_set => 1); 248 $hpane->set (position_set => 1);
243 249
244 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0); 250 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
245 251
246 { 252 {
247 $frame->add (my $vbox = new Gtk2::VBox); 253 $frame->add (my $vbox = new Gtk2::VBox);
248 $vbox->add ($self->{title} = new Gtk2::Label $title); 254 $vbox->add ($self->{title} = new Gtk2::Label "-");
249 255
250 $vbox->add (my $hbox = new Gtk2::HBox); 256 $vbox->add (my $hbox = new Gtk2::HBox);
251 257
252 $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);
253 259
254 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 260 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
255 261
256 $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);
257 $scale->set_draw_value (0); 263 $scale->set_draw_value (0);
… …
316 } 322 }
317 }); 323 });
318 } 324 }
319} 325}
320 326
327### JOIN/LEAVE ##############################################################
328
329sub join {
330 my ($self) = @_;
331 return if $self->{joined};
332
333 $self->SUPER::join;
334}
335
336sub event_join {
337 my ($self) = @_;
338
339 $self->SUPER::event_join (@_);
340 $self->init_tree;
341 $self->event_update_game;
342}
343
344sub event_part {
345 my ($self) = @_;
346
347 $self->SUPER::event_part;
348 $self->destroy;
349}
350
351sub event_quit {
352 my ($self) = @_;
353
354 $self->SUPER::event_quit;
355 $self->destroy;
356}
357
358### USERS ###################################################################
359
360sub draw_users {
361 my ($self, $inlay) = @_;
362
363 for (sort keys %{$self->{users}}) {
364 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
365 }
366}
367
321sub event_update_users { 368sub event_update_users {
322 my ($self, $add, $update, $remove) = @_; 369 my ($self, $add, $update, $remove) = @_;
323 370
324# $self->{userlist}->update ($add, $update, $remove); 371# $self->{userlist}->update ($add, $update, $remove);
325 372
… …
341 $self->{chat}->append_text ("\n<header>Parts:</header>"); 388 $self->{chat}->append_text ("\n<header>Parts:</header>");
342 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 389 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
343 } 390 }
344} 391}
345 392
346sub join { 393### GAME INFO ###############################################################
394
395sub draw_setup {
347 my ($self) = @_; 396 my ($self, $inlay) = @_;
397
348 return if $self->{joined}; 398 return unless $self->{joined};
349 399
350 $self->SUPER::join; 400 my $rules = $self->{rules};
401
402 my $text = "";
403
404 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
405 if $self->{teacher};
406
407 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
408 if $self->{owner}->is_valid;
409
410 if ($self->is_inprogress) {
411 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
412 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
413 }
414 $text .= "\nType: " . util::toxml $gametype{$self->type};
415
416 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
417
418 $text .= "\nTime: ";
419
420 if ($rules->{timesys} == TIMESYS_NONE) {
421 $text .= "UNLIMITED";
422 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
423 $text .= util::format_time $rules->{time};
424 $text .= " ABS";
425 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
426 $text .= util::format_time $rules->{time};
427 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
428 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
429 $text .= util::format_time $rules->{time};
430 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
431 }
432
433 $text .= "\nFlags:";
434 $text .= " private" if $self->is_private;
435 $text .= " started" if $self->is_inprogress;
436 $text .= " adjourned" if $self->is_adjourned;
437 $text .= " scored" if $self->is_scored;
438 $text .= " saved" if $self->is_saved;
439
440 if ($self->is_inprogress) {
441 $text .= "\nHandicap: " . $self->{handicap};
442 $text .= "\nKomi: " . $self->{komi};
443 $text .= "\nSize: " . $self->size_string;
444 }
445
446 if ($self->is_scored) {
447 $text .= "\nResult: " . $self->score_string;
448 }
449
450 $inlay->append_text ("<infoblock>$text</infoblock>");
451
452}
453
454sub event_update_game {
455 my ($self) = @_;
456
457 $self->SUPER::event_update_game;
458
459 return unless $self->{joined};
460
461 $self->{colour} = $self->player_colour ($self->{conn}{name});
462
463 $self->{user}[COLOUR_BLACK] = $self->{black};
464 $self->{user}[COLOUR_WHITE] = $self->{white};
465
466 # show board
467 if ($self->is_inprogress) {
468 if (!$self->{board}) {
469 $self->{left}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
470 $self->{board}->signal_connect (button_release => sub {
471 return unless $self->{cur_board};
472 if ($_[1] == 1) {
473 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
474 }
475 });
476 $self->{board}->show_all;
477 }
478 if (my $ch = delete $self->{challenge}) {
479 $_->{inlay}->destroy for values %$ch;
480 }
481 $self->update_cursor;
482 }
483
484 my $title = defined $self->{channel}
485 ? $self->owner->as_string . " " . $self->opponent_string
486 : "Game Window";
487 $self->set_title ("KGS Game $title");
488 $self->{title}->set_text ($title); # title gets redrawn wrongly
489
490 $self->{rules_inlay}->refresh;
491
492 if (exists $self->{teacher}) {
493 $self->{teacher_inlay} ||= $self->{chat}->new_inlay;
494 $self->{teacher_inlay}->clear;
495 $self->{teacher_inlay}->append_text ("\n<header>Teacher:</header> <user>"
496 . (util::toxml $self->{teacher}) . "</user>");
497 } elsif ($self->{teacher_inlay}) {
498 (delete $self->{teacher_inlay})->clear;
499 }
500
501 $self->update_cursor;
502}
503
504sub event_update_rules {
505 my ($self, $rules) = @_;
506
507 $self->{rules} = $rules;
508
509 if ($self->{user}) {
510 # todo. gets drawn wrongly
511
512 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
513 for COLOUR_BLACK, COLOUR_WHITE;
514 }
515
516 sound::play 3, "gamestart";
517 $self->{rules_inlay}->refresh;
518}
519
520### BOARD DISPLAY ###########################################################
521
522sub update_timers {
523 my ($self, $timers) = @_;
524
525 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
526
527 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
528 my $t = $timers->[$colour];
529 $self->{userpanel}[$colour]->set_timer (
530 $running && $colour == $self->{whosemove} && $t->[0],
531 $t->[1] || $self->{rules}{time}
532 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
533 && $self->{rules}{interval} * $self->{rules}{count}),
534 $t->[2]);
535 }
536}
537
538sub inject_set_gametime {
539 my ($self, $msg) = @_;
540
541 $self->{timers} = [
542 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
543 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
544 ];
545
546 $self->update_timers ($self->{timers})
547 if $self->{showmove} == @{$self->{path}};
351} 548}
352 549
353sub update_cursor { 550sub update_cursor {
354 my ($self) = @_; 551 my ($self) = @_;
552
553 return unless $self->{cur_board};
355 554
356 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active; 555 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
357 556
358 delete $self->{board_click}; 557 delete $self->{board_click};
359 558
… …
393 592
394 } elsif ($self->{colour} == $self->{whosemove}) { 593 } elsif ($self->{colour} == $self->{whosemove}) {
395 # normal move 594 # normal move
396 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1); 595 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
397 $self->{board}->set (cursor => sub { 596 $self->{board}->set (cursor => sub {
398 # if is_valid_move oder so#TODO# 597 $self->{cur_board}
399 $_[0] & (MARK_B | MARK_W) 598 && $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
400 ? $_[0] 599 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
401 : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B); 600 ? $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
601 : $_[0];
402 }); 602 });
403 $self->{board_click} = sub { 603 $self->{board_click} = sub {
604 return unless
605 $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
606 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND);
404 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]); 607 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
405 $self->{board}->set (cursor => undef); 608 $self->{board}->set (cursor => undef);
406 delete $self->{board_click}; 609 delete $self->{board_click};
407 $self->{button_pass}->sensitive (0); 610 $self->{button_pass}->sensitive (0);
408 }; 611 };
… …
417 $self->{board}->set (cursor => undef); 620 $self->{board}->set (cursor => undef);
418 #TODO# # implement coordinate-grabbing 621 #TODO# # implement coordinate-grabbing
419 } 622 }
420} 623}
421 624
422sub update_timers {
423 my ($self, $timers) = @_;
424
425 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
426
427 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
428 my $t = $timers->[$colour];
429 $self->{userpanel}[$colour]->set_timer (
430 $running && $colour == $self->{whosemove} && $t->[0],
431 $t->[1] || $self->{rules}{time}
432 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
433 && $self->{rules}{interval} * $self->{rules}{count}),
434 $t->[2] || $self->{rules}{count});
435 }
436}
437
438sub update_board { 625sub update_board {
439 my ($self) = @_; 626 my ($self) = @_;
627
440 return unless $self->{path}; 628 return unless $self->{path};
441
442 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
443
444 $self->{cur_board} = new KGS::Game::Board $self->{size};
445 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
446
447 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
448 for COLOUR_WHITE, COLOUR_BLACK;
449 629
450 if ($self->{rules}{ruleset} == RULESET_JAPANESE) { 630 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
451 if ($self->{curnode}{move} == 0) { 631 if ($self->{curnode}{move} == 0) {
452 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK; 632 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
453 } else { 633 } else {
… …
462 } else { 642 } else {
463 $self->{whosemove} = 1 - $self->{cur_board}{last}; 643 $self->{whosemove} = 1 - $self->{cur_board}{last};
464 } 644 }
465 } 645 }
466 646
647 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
648
649 $self->{cur_board} = new KGS::Game::Board $self->{size};
650 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
651
652 $self->update_cursor;
653
654 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
655 for COLOUR_WHITE, COLOUR_BLACK;
656
467 my $start_time = $self->{rules}{time}; 657 my $start_time = $self->{rules}{time};
468 658
469 if ($self->{showmove} == @{$self->{path}}) { 659 if ($self->{showmove} == @{$self->{path}}) {
470 $self->{timers} = [ 660 $self->{timers} = [
471 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}], 661 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
… …
490 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]" 680 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
491 . "</score>"); 681 . "</score>");
492 } elsif ($self->{score_inlay}) { 682 } elsif ($self->{score_inlay}) {
493 (delete $self->{score_inlay})->clear; 683 (delete $self->{score_inlay})->clear;
494 } 684 }
495
496 $self->update_cursor;
497} 685}
498 686
499sub event_update_tree { 687sub event_update_tree {
500 my ($self) = @_; 688 my ($self) = @_;
501 689
… …
554 } 742 }
555 743
556 $self->{chat}->append_text ($text); 744 $self->{chat}->append_text ($text);
557} 745}
558 746
559sub event_join {
560 my ($self) = @_;
561
562 $self->SUPER::event_join (@_);
563 $self->init_tree;
564 $self->event_update_game;
565}
566
567sub event_part {
568 my ($self) = @_;
569
570 $self->SUPER::event_part;
571 $self->destroy;
572}
573
574sub event_move { 747sub event_move {
575 my ($self, $pass) = @_; 748 my ($self, $pass) = @_;
576 749
577 sound::play 1, $pass ? "pass" : "move"; 750 sound::play 1, $pass ? "pass" : "move";
578} 751}
579 752
580sub event_update_game { 753### GAMEPLAY EVENTS #########################################################
581 my ($self) = @_;
582
583 $self->SUPER::event_update_game;
584
585 return unless $self->{joined};
586
587 $self->{colour} = $self->player_colour ($self->{conn}{name});
588
589 my $title = defined $self->{channel}
590 ? $self->owner->as_string . " " . $self->opponent_string
591 : "Game Window";
592 $self->set_title ("KGS Game $title");
593 $self->{title}->set_text ($title);
594
595 $self->{user}[COLOUR_BLACK] = $self->{black};
596 $self->{user}[COLOUR_WHITE] = $self->{white};
597
598 # show board
599 if ($self->is_inprogress) {
600 if (!$self->{boardbox}->parent) {
601 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
602 $self->{left}->add ($self->{boardbox});
603 $self->{board}->signal_connect (button_release => sub {
604 if ($_[1] == 1) {
605 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
606 }
607 });
608 }
609 if (my $ch = delete $self->{challenge}) {
610 $_->{inlay}->destroy for values %$ch;
611 }
612 $self->update_cursor;
613 }
614
615 $self->{left}->show_all;
616
617 $self->{rules_inlay}->refresh;
618
619}
620
621sub draw_setup {
622 my ($self, $inlay) = @_;
623
624 return unless $self->{joined};
625
626 my $rules = $self->{rules};
627
628 my $text = "";
629
630 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
631 if $self->{teacher};
632
633 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
634 if $self->{owner}->is_valid;
635
636 if ($self->is_inprogress) {
637 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
638 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
639 }
640 $text .= "\nType: " . util::toxml $gametype{$self->type};
641
642 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
643
644 $text .= "\nTime: ";
645
646 if ($rules->{timesys} == TIMESYS_NONE) {
647 $text .= "UNLIMITED";
648 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
649 $text .= util::format_time $rules->{time};
650 $text .= " ABS";
651 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
652 $text .= util::format_time $rules->{time};
653 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
654 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
655 $text .= util::format_time $rules->{time};
656 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
657 }
658
659 $text .= "\nFlags:";
660 $text .= " private" if $self->is_private;
661 $text .= " started" if $self->is_inprogress;
662 $text .= " adjourned" if $self->is_adjourned;
663 $text .= " scored" if $self->is_scored;
664 $text .= " saved" if $self->is_saved;
665
666 if ($self->is_inprogress) {
667 $text .= "\nHandicap: " . $self->{handicap};
668 $text .= "\nKomi: " . $self->{komi};
669 $text .= "\nSize: " . $self->size_string;
670 }
671
672 if ($self->is_scored) {
673 $text .= "\nResult: " . $self->score_string;
674 }
675
676 $inlay->append_text ("<infoblock>$text</infoblock>");
677
678}
679
680sub event_update_rules {
681 my ($self, $rules) = @_;
682
683 $self->{rules} = $rules;
684
685 if ($self->{user}) {
686 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
687 for COLOUR_BLACK, COLOUR_WHITE;
688 }
689
690 sound::play 3, "gamestart";
691 $self->{rules_inlay}->refresh;
692}
693 754
694sub event_resign_game { 755sub event_resign_game {
695 my ($self, $player) = @_; 756 my ($self, $player) = @_;
696 757
697 sound::play 3, "resign"; 758 sound::play 3, "resign";
698 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 759 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
699 . "\n<user>" 760 . "\n<user>"
700 . (util::toxml $self->{user}[$msg->{player}]->as_string) 761 . (util::toxml $self->{user}[$msg->{player}]->as_string)
701 . "</user> resigned.</infoblock>"); 762 . "</user> resigned."
763 . "\n<user>"
764 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
765 . "</user> wins the game."
766 . "</infoblock>");
702} 767}
703 768
704sub event_out_of_time { 769sub event_time_win {
705 my ($self, $player) = @_; 770 my ($self, $player) = @_;
706 771
707 sound::play 3, "timewin"; 772 sound::play 3, "timewin";
708 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>" 773 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
709 . "\n<user>" 774 . "\n<user>"
775 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
776 . "</user> ran out of time and lost."
777 . "\n<user>"
710 . (util::toxml $self->{user}[$msg->{player}]->as_string) 778 . (util::toxml $self->{user}[$msg->{player}]->as_string)
779 . "</user> wins the game."
780 . "</infoblock>");
781}
782
783sub event_owner_left {
784 my ($self) = @_;
785
786 $self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
711 . "</user> ran out of time and lost.</infoblock>"); 787 . "\nThe owner of this game left.</infoblock>");
788}
789
790sub event_teacher_left {
791 my ($self) = @_;
792
793 $self->{chat}->append_text ("\n<infoblock><header>Teacher left</header>"
794 . "\nThe teacher left the game.</infoblock>");
712} 795}
713 796
714sub event_done { 797sub event_done {
715 my ($self) = @_; 798 my ($self) = @_;
716 799
… …
736 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>" 819 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
737 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 820 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
738 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 821 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
739 . "</infoblock>" 822 . "</infoblock>"
740 ); 823 );
741}
742
743sub inject_set_gametime {
744 my ($self, $msg) = @_;
745
746 $self->{timers} = [
747 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
748 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
749 ];
750
751 $self->update_timers ($self->{timers})
752 if $self->{showmove} == @{$self->{path}};
753} 824}
754 825
755sub inject_req_undo { 826sub inject_req_undo {
756 my ($self, $msg) = @_; 827 my ($self, $msg) = @_;
757 828
… …
785 } 856 }
786 857
787 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>"); 858 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
788 delete $self->{cid}; 859 delete $self->{cid};
789} 860}
861
862### CHALLENGE HANDLING ######################################################
790 863
791sub draw_challenge { 864sub draw_challenge {
792 my ($self, $id) = @_; 865 my ($self, $id) = @_;
793 866
794 my $info = $self->{challenge}{$id}; 867 my $info = $self->{challenge}{$id};
… …
950 }); 1023 });
951 } 1024 }
952 } 1025 }
953} 1026}
954 1027
955sub draw_users { 1028sub new_game_challenge {
956 my ($self, $inlay) = @_; 1029 my ($self) = @_;
957 1030
958 for (sort keys %{$self->{users}}) { 1031 my $d = $self->{app}{defaults};
959 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>"); 1032
1033 $self->{challenge}{""} = {
1034 gametype => $d->{gametype},
1035 flags => 0,
1036 notes => $d->{stones},
1037 rules => {
1038 ruleset => $d->{ruleset},
1039 size => $d->{size},
1040 timesys => $d->{timesys},
1041 time => $d->{time},
1042 interval => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_time} : $d->{can_time},
1043 count => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_periods} : $d->{can_stones},
1044 },
1045
1046 inlay => $self->{chat}->new_inlay,
960 } 1047 };
1048 $self->draw_challenge ("");
961} 1049}
962 1050
963sub event_challenge { 1051sub event_challenge {
964 my ($self, $info) = @_; 1052 my ($self, $info) = @_;
965 1053

Diff Legend

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