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.109 by root, Mon May 31 03:28:15 2004 UTC vs.
Revision 1.121 by root, Wed Jun 2 04:39:07 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;
… …
208 218
209use POSIX qw(ceil); 219use POSIX qw(ceil);
210 220
211sub new { 221sub new {
212 my ($self, %arg) = @_; 222 my ($self, %arg) = @_;
223
213 $self = $self->Glib::Object::new; 224 $self = $self->Glib::Object::new;
214 $self->{$_} = delete $arg{$_} for keys %arg; 225 $self->{$_} = delete $arg{$_} for keys %arg;
215 226
216 gtk::state $self, "game::window", undef, window_size => [600, 500]; 227 gtk::state $self, "game::window", undef, window_size => [620, 460];
217 228
218 $self->signal_connect (destroy => sub { 229 $self->signal_connect (destroy => sub {
219 $self->unlisten; 230 $self->unlisten;
220 delete $self->{app}{game}{$self->{channel}}; 231 delete $self->{app}{game}{$self->{channel}};
221 %{$_[0]} = (); 232 %{$_[0]} = ();
222 });#d# 233 });#d#
223 234
224 $self->add (my $hpane = new Gtk2::HPaned); 235 $self->add (my $hpane = new Gtk2::HPaned);
225 gtk::state $hpane, "game::hpane", undef, position => 500; 236 gtk::state $hpane, "game::hpane", undef, position => 420;
226 237
227 # LEFT PANE 238 # LEFT PANE
228 239
229 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0); 240 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
230 241
231 $self->{boardbox} = new Gtk2::VBox;
232
233 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 242 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
234 243
235 # board box (aspect/canvas) 244 # board box (aspect/canvas)
236 245
237 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
238
239 # RIGHT PANE 246 # RIGHT PANE
240 247
241 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1); 248 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
242 $hpane->set (position_set => 1); 249 $hpane->set (position_set => 1);
243 250
244 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0); 251 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
245 252
246 { 253 {
247 $frame->add (my $vbox = new Gtk2::VBox); 254 $frame->add (my $vbox = new Gtk2::VBox);
248 $vbox->add ($self->{title} = new Gtk2::Label $title); 255 $vbox->add ($self->{title} = new Gtk2::Label "-");
249 256
250 $vbox->add (my $hbox = new Gtk2::HBox); 257 $vbox->add (my $hbox = new Gtk2::HBox);
251 258
252 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0); 259 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 0, 0);
253 260
254 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 261 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
255 262
256 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); 263 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
257 $scale->set_draw_value (0); 264 $scale->set_draw_value (0);
… …
269 for COLOUR_WHITE, COLOUR_BLACK; 276 for COLOUR_WHITE, COLOUR_BLACK;
270 277
271 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0); 278 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
272 279
273 $buttonbox->add ($self->{button_pass} = 280 $buttonbox->add ($self->{button_pass} =
274 Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0)); 281 Gtk2::Button->Glib::Object::new (label => "Pass", visible => 0));
275 $self->{button_pass}->signal_connect (clicked => sub { 282 $self->{button_pass}->signal_connect (clicked => sub {
276 $self->{board_click}->(255, 255) if $self->{board_click}; 283 $self->{board_click}->(255, 255) if $self->{board_click};
277 }); 284 });
285 eval { $self->{button_pass}->set (no_show_all => 1) }; # workaround for gtk+-2.2
278 $buttonbox->add ($self->{button_undo} = 286 $buttonbox->add ($self->{button_undo} =
279 Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0)); 287 Gtk2::Button->Glib::Object::new (label => "Undo", visible => 0));
280 $self->{button_undo}->signal_connect (clicked => sub { 288 $self->{button_undo}->signal_connect (clicked => sub {
281 $self->send (req_undo => channel => $self->{channel}); 289 $self->send (req_undo => channel => $self->{channel});
282 }); 290 });
291 eval { $self->{button_undo}->set (no_show_all => 1) }; # workaround for gtk+-2.2
283 $buttonbox->add ($self->{button_resign} = 292 $buttonbox->add ($self->{button_resign} =
284 Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0)); 293 Gtk2::Button->Glib::Object::new (label => "Resign", visible => 0));
285 $self->{button_resign}->signal_connect (clicked => sub { 294 $self->{button_resign}->signal_connect (clicked => sub {
286 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour}); 295 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
287 }); 296 });
297 eval { $self->{button_resign}->set (no_show_all => 1) }; # workaround for gtk+-2.2
288 298
289 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0); 299 $vbox->pack_start (($self->{chat} = new chat), 1, 1, 0);
290 300
291 $self->set_channel ($self->{channel}); 301 $self->set_channel ($self->{channel});
292 302
293 $self->show_all; 303 $self->show_all;
294 304
… …
316 } 326 }
317 }); 327 });
318 } 328 }
319} 329}
320 330
331### JOIN/LEAVE ##############################################################
332
333sub join {
334 my ($self) = @_;
335 return if $self->{joined};
336
337 $self->SUPER::join;
338}
339
340sub event_join {
341 my ($self) = @_;
342
343 $self->SUPER::event_join (@_);
344 $self->init_tree;
345 $self->event_update_game;
346}
347
348sub event_part {
349 my ($self) = @_;
350
351 $self->SUPER::event_part;
352 $self->destroy;
353}
354
355sub event_quit {
356 my ($self) = @_;
357
358 $self->SUPER::event_quit;
359 $self->destroy;
360}
361
362### USERS ###################################################################
363
364sub draw_users {
365 my ($self, $inlay) = @_;
366
367 for (sort keys %{$self->{users}}) {
368 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
369 }
370}
371
321sub event_update_users { 372sub event_update_users {
322 my ($self, $add, $update, $remove) = @_; 373 my ($self, $add, $update, $remove) = @_;
323 374
324# $self->{userlist}->update ($add, $update, $remove); 375# $self->{userlist}->update ($add, $update, $remove);
325 376
… …
341 $self->{chat}->append_text ("\n<header>Parts:</header>"); 392 $self->{chat}->append_text ("\n<header>Parts:</header>");
342 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 393 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
343 } 394 }
344} 395}
345 396
346sub join { 397### GAME INFO ###############################################################
398
399sub draw_setup {
347 my ($self) = @_; 400 my ($self, $inlay) = @_;
401
348 return if $self->{joined}; 402 return unless $self->{joined};
349 403
350 $self->SUPER::join; 404 my $rules = $self->{rules};
405
406 my $text = "";
407
408 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
409 if $self->{teacher};
410
411 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
412 if $self->{owner}->is_valid;
413
414 if ($self->is_inprogress) {
415 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
416 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
417 }
418 $text .= "\nType: " . util::toxml $gametype{$self->type};
419
420 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
421
422 $text .= "\nTime: ";
423
424 if ($rules->{timesys} == TIMESYS_NONE) {
425 $text .= "UNLIMITED";
426 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
427 $text .= util::format_time $rules->{time};
428 $text .= " ABS";
429 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
430 $text .= util::format_time $rules->{time};
431 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
432 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
433 $text .= util::format_time $rules->{time};
434 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
435 }
436
437 $text .= "\nFlags:";
438 $text .= " private" if $self->is_private;
439 $text .= " started" if $self->is_inprogress;
440 $text .= " adjourned" if $self->is_adjourned;
441 $text .= " scored" if $self->is_scored;
442 $text .= " saved" if $self->is_saved;
443
444 if ($self->is_inprogress) {
445 $text .= "\nHandicap: " . $self->{handicap};
446 $text .= "\nKomi: " . $self->{komi};
447 $text .= "\nSize: " . $self->size_string;
448 }
449
450 if ($self->is_scored) {
451 $text .= "\nResult: " . $self->score_string;
452 }
453
454 $inlay->append_text ("<infoblock>$text</infoblock>");
455
456}
457
458sub event_update_game {
459 my ($self) = @_;
460
461 $self->SUPER::event_update_game;
462
463 return unless $self->{joined};
464
465 $self->{colour} = $self->player_colour ($self->{conn}{name});
466
467 $self->{user}[COLOUR_BLACK] = $self->{black};
468 $self->{user}[COLOUR_WHITE] = $self->{white};
469
470 # show board
471 if ($self->is_inprogress) {
472 if (!$self->{board}) {
473 $self->{left}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
474 $self->{board}->signal_connect (button_release => sub {
475 return unless $self->{cur_board};
476 if ($_[1] == 1) {
477 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
478 }
479 });
480 $self->{board}->show_all;
481 }
482 if (my $ch = delete $self->{challenge}) {
483 $_->{inlay}->destroy for values %$ch;
484 }
485 $self->update_cursor;
486 }
487
488 my $title = defined $self->{channel}
489 ? $self->owner->as_string . " " . $self->opponent_string
490 : "Game Window";
491 $self->set_title ("KGS Game $title");
492 $self->{title}->set_text ($title); # title gets redrawn wrongly
493
494 $self->{rules_inlay}->refresh;
495
496 if (exists $self->{teacher}) {
497 $self->{teacher_inlay} ||= $self->{chat}->new_inlay;
498 $self->{teacher_inlay}->clear;
499 $self->{teacher_inlay}->append_text ("\n<header>Teacher:</header> <user>"
500 . (util::toxml $self->{teacher}) . "</user>");
501 } elsif ($self->{teacher_inlay}) {
502 (delete $self->{teacher_inlay})->clear;
503 }
504
505 $self->update_cursor;
506}
507
508sub event_update_rules {
509 my ($self, $rules) = @_;
510
511 $self->{rules} = $rules;
512
513 if ($self->{user}) {
514 # todo. gets drawn wrongly
515
516 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
517 for COLOUR_BLACK, COLOUR_WHITE;
518 }
519
520 sound::play 3, "gamestart";
521 $self->{rules_inlay}->refresh;
522}
523
524### BOARD DISPLAY ###########################################################
525
526sub update_timers {
527 my ($self, $timers) = @_;
528
529 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
530
531 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
532 my $t = $timers->[$colour];
533 $self->{userpanel}[$colour]->set_timer (
534 $running && $colour == $self->{whosemove} && $t->[0],
535 $t->[1] || $self->{rules}{time}
536 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
537 && $self->{rules}{interval} * $self->{rules}{count}),
538 $t->[2]);
539 }
540}
541
542sub inject_set_gametime {
543 my ($self, $msg) = @_;
544
545 $self->{timers} = [
546 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
547 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
548 ];
549
550 $self->update_timers ($self->{timers})
551 if $self->{showmove} == @{$self->{path}};
351} 552}
352 553
353sub update_cursor { 554sub update_cursor {
354 my ($self) = @_; 555 my ($self) = @_;
556
557 return unless $self->{cur_board};
355 558
356 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active; 559 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
357 560
358 delete $self->{board_click}; 561 delete $self->{board_click};
359 562
… …
393 596
394 } elsif ($self->{colour} == $self->{whosemove}) { 597 } elsif ($self->{colour} == $self->{whosemove}) {
395 # normal move 598 # normal move
396 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1); 599 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
397 $self->{board}->set (cursor => sub { 600 $self->{board}->set (cursor => sub {
398 # if is_valid_move oder so#TODO# 601 $self->{cur_board}
399 $_[0] & (MARK_B | MARK_W) 602 && $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
400 ? $_[0] 603 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
401 : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B); 604 ? $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
605 : $_[0];
402 }); 606 });
403 $self->{board_click} = sub { 607 $self->{board_click} = sub {
608 return unless
609 $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
610 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND);
404 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]); 611 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
405 $self->{board}->set (cursor => undef); 612 $self->{board}->set (cursor => undef);
406 delete $self->{board_click}; 613 delete $self->{board_click};
407 $self->{button_pass}->sensitive (0); 614 $self->{button_pass}->sensitive (0);
408 }; 615 };
… …
417 $self->{board}->set (cursor => undef); 624 $self->{board}->set (cursor => undef);
418 #TODO# # implement coordinate-grabbing 625 #TODO# # implement coordinate-grabbing
419 } 626 }
420} 627}
421 628
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 { 629sub update_board {
439 my ($self) = @_; 630 my ($self) = @_;
631
440 return unless $self->{path}; 632 return unless $self->{path};
441 633
442 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1)); 634 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
443 635
444 $self->{cur_board} = new KGS::Game::Board $self->{size}; 636 $self->{cur_board} = new KGS::Game::Board $self->{size};
445 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]); 637 $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 638
450 if ($self->{rules}{ruleset} == RULESET_JAPANESE) { 639 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
451 if ($self->{curnode}{move} == 0) { 640 if ($self->{curnode}{move} == 0) {
452 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK; 641 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
453 } else { 642 } else {
… …
462 } else { 651 } else {
463 $self->{whosemove} = 1 - $self->{cur_board}{last}; 652 $self->{whosemove} = 1 - $self->{cur_board}{last};
464 } 653 }
465 } 654 }
466 655
656 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
657 for COLOUR_WHITE, COLOUR_BLACK;
658
467 my $start_time = $self->{rules}{time}; 659 my $start_time = $self->{rules}{time};
468 660
469 if ($self->{showmove} == @{$self->{path}}) { 661 if ($self->{showmove} == @{$self->{path}}) {
470 $self->{timers} = [ 662 $self->{timers} = [
471 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}], 663 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
… …
492 } elsif ($self->{score_inlay}) { 684 } elsif ($self->{score_inlay}) {
493 (delete $self->{score_inlay})->clear; 685 (delete $self->{score_inlay})->clear;
494 } 686 }
495 687
496 $self->update_cursor; 688 $self->update_cursor;
689
497} 690}
498 691
499sub event_update_tree { 692sub event_update_tree {
500 my ($self) = @_; 693 my ($self) = @_;
501 694
… …
554 } 747 }
555 748
556 $self->{chat}->append_text ($text); 749 $self->{chat}->append_text ($text);
557} 750}
558 751
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 { 752sub event_move {
575 my ($self, $pass) = @_; 753 my ($self, $pass) = @_;
576 754
577 sound::play 1, $pass ? "pass" : "move"; 755 sound::play 1, $pass ? "pass" : "move";
578} 756}
579 757
580sub event_update_game { 758### 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 759
694sub event_resign_game { 760sub event_resign_game {
695 my ($self, $player) = @_; 761 my ($self, $player) = @_;
696 762
697 sound::play 3, "resign"; 763 sound::play 3, "resign";
698 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 764 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
699 . "\n<user>" 765 . "\n<user>"
700 . (util::toxml $self->{user}[$msg->{player}]->as_string) 766 . (util::toxml $self->{user}[$msg->{player}]->as_string)
701 . "</user> resigned.</infoblock>"); 767 . "</user> resigned."
768 . "\n<user>"
769 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
770 . "</user> wins the game."
771 . "</infoblock>");
702} 772}
703 773
704sub event_out_of_time { 774sub event_time_win {
705 my ($self, $player) = @_; 775 my ($self, $player) = @_;
706 776
707 sound::play 3, "timewin"; 777 sound::play 3, "timewin";
708 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>" 778 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
709 . "\n<user>" 779 . "\n<user>"
780 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
781 . "</user> ran out of time and lost."
782 . "\n<user>"
710 . (util::toxml $self->{user}[$msg->{player}]->as_string) 783 . (util::toxml $self->{user}[$msg->{player}]->as_string)
784 . "</user> wins the game."
785 . "</infoblock>");
786}
787
788sub event_owner_left {
789 my ($self) = @_;
790
791 $self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
711 . "</user> ran out of time and lost.</infoblock>"); 792 . "\nThe owner of this game left.</infoblock>");
793}
794
795sub event_teacher_left {
796 my ($self) = @_;
797
798 $self->{chat}->append_text ("\n<infoblock><header>Teacher left</header>"
799 . "\nThe teacher left the game.</infoblock>");
712} 800}
713 801
714sub event_done { 802sub event_done {
715 my ($self) = @_; 803 my ($self) = @_;
716 804
… …
736 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>" 824 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
737 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 825 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
738 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 826 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
739 . "</infoblock>" 827 . "</infoblock>"
740 ); 828 );
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} 829}
754 830
755sub inject_req_undo { 831sub inject_req_undo {
756 my ($self, $msg) = @_; 832 my ($self, $msg) = @_;
757 833
… …
785 } 861 }
786 862
787 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>"); 863 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
788 delete $self->{cid}; 864 delete $self->{cid};
789} 865}
866
867### CHALLENGE HANDLING ######################################################
790 868
791sub draw_challenge { 869sub draw_challenge {
792 my ($self, $id) = @_; 870 my ($self, $id) = @_;
793 871
794 my $info = $self->{challenge}{$id}; 872 my $info = $self->{challenge}{$id};
… …
950 }); 1028 });
951 } 1029 }
952 } 1030 }
953} 1031}
954 1032
955sub draw_users { 1033sub new_game_challenge {
956 my ($self, $inlay) = @_; 1034 my ($self) = @_;
957 1035
958 for (sort keys %{$self->{users}}) { 1036 my $d = $self->{app}{defaults};
959 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>"); 1037
1038 $self->{challenge}{""} = {
1039 gametype => $d->{gametype},
1040 flags => 0,
1041 notes => $d->{stones},
1042 rules => {
1043 ruleset => $d->{ruleset},
1044 size => $d->{size},
1045 timesys => $d->{timesys},
1046 time => $d->{time},
1047 interval => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_time} : $d->{can_time},
1048 count => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_periods} : $d->{can_stones},
1049 },
1050
1051 inlay => $self->{chat}->new_inlay,
960 } 1052 };
1053 $self->draw_challenge ("");
961} 1054}
962 1055
963sub event_challenge { 1056sub event_challenge {
964 my ($self, $info) = @_; 1057 my ($self, $info) = @_;
965 1058
… …
971 sound::play 2, "info"; 1064 sound::play 2, "info";
972 1065
973 $self->{challenge}{$id} = $info; 1066 $self->{challenge}{$id} = $info;
974 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay ( 1067 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
975 exists $self->{challenge}{""} 1068 exists $self->{challenge}{""}
976 ? "Challenge from $opponent->{name}" 1069 ? "Challenge from " . $opponent->as_string
977 : "Challenge to $opponent->{name}", 1070 : "Challenge to " . $opponent->as_string,
978 sub { 1071 sub {
979 $self->{challenge}{$id}{inlay} = $_[0]; 1072 $self->{challenge}{$id}{inlay} = $_[0];
980 $self->draw_challenge ($id); 1073 $self->draw_challenge ($id);
981 }, 1074 },
982 !exists $self->{challenge}{""} # only open when not offerer 1075 !exists $self->{challenge}{""} # only open when not offerer

Diff Legend

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