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.108 by root, Mon May 31 03:05:30 2004 UTC vs.
Revision 1.126 by root, Wed Jun 2 12:23:35 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];
228 $self->set (allow_shrink => 1);
217 229
218 $self->signal_connect (destroy => sub { 230 $self->signal_connect (destroy => sub {
219 $self->unlisten; 231 $self->unlisten;
220 delete $self->{app}{game}{$self->{channel}}; 232 delete $self->{app}{game}{$self->{channel}};
221 %{$_[0]} = (); 233 %{$_[0]} = ();
222 });#d# 234 });#d#
223 235
224 $self->add (my $hpane = new Gtk2::HPaned); 236 $self->add (my $hpane = new Gtk2::HPaned);
225 gtk::state $hpane, "game::hpane", undef, position => 500; 237 gtk::state $hpane, "game::hpane", undef, position => 420;
226 238
227 # LEFT PANE 239 # LEFT PANE
228 240
229 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0); 241 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
230 242
231 $self->{boardbox} = new Gtk2::VBox;
232
233 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 243 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
234 244
235 # board box (aspect/canvas) 245 # board box (aspect/canvas)
236 246
237 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
238
239 # RIGHT PANE 247 # RIGHT PANE
240 248
241 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1); 249 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
242 $hpane->set (position_set => 1); 250 $hpane->set (position_set => 1);
243 251
244 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0); 252 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
245 253
246 { 254 {
247 $frame->add (my $vbox = new Gtk2::VBox); 255 $frame->add (my $vbox = new Gtk2::VBox);
248 $vbox->add ($self->{title} = new Gtk2::Label $title); 256 $vbox->add ($self->{title} = new Gtk2::Label "-");
249 257
250 $vbox->add (my $hbox = new Gtk2::HBox); 258 $vbox->add (my $hbox = new Gtk2::HBox);
251 259
252 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0); 260 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 0, 0);
253 261
254 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 262 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
255 263
256 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); 264 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
257 $scale->set_draw_value (0); 265 $scale->set_draw_value (0);
… …
269 for COLOUR_WHITE, COLOUR_BLACK; 277 for COLOUR_WHITE, COLOUR_BLACK;
270 278
271 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0); 279 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
272 280
273 $buttonbox->add ($self->{button_pass} = 281 $buttonbox->add ($self->{button_pass} =
274 Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0)); 282 Gtk2::Button->Glib::Object::new (label => "Pass", visible => 0));
275 $self->{button_pass}->signal_connect (clicked => sub { 283 $self->{button_pass}->signal_connect (clicked => sub {
276 $self->{board_click}->(255, 255) if $self->{board_click}; 284 $self->{board_click}->(255, 255) if $self->{board_click};
277 }); 285 });
286 eval { $self->{button_pass}->set (no_show_all => 1) }; # workaround for gtk+-2.2
278 $buttonbox->add ($self->{button_undo} = 287 $buttonbox->add ($self->{button_undo} =
279 Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0)); 288 Gtk2::Button->Glib::Object::new (label => "Undo", visible => 0));
280 $self->{button_undo}->signal_connect (clicked => sub { 289 $self->{button_undo}->signal_connect (clicked => sub {
281 $self->send (req_undo => channel => $self->{channel}); 290 $self->send (req_undo => channel => $self->{channel});
282 }); 291 });
292 eval { $self->{button_undo}->set (no_show_all => 1) }; # workaround for gtk+-2.2
283 $buttonbox->add ($self->{button_resign} = 293 $buttonbox->add ($self->{button_resign} =
284 Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0)); 294 Gtk2::Button->Glib::Object::new (label => "Resign", visible => 0));
285 $self->{button_resign}->signal_connect (clicked => sub { 295 $self->{button_resign}->signal_connect (clicked => sub {
286 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour}); 296 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
287 }); 297 });
298 eval { $self->{button_resign}->set (no_show_all => 1) }; # workaround for gtk+-2.2
288 299
289 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0); 300 $vbox->pack_start (($self->{chat} = new chat), 1, 1, 0);
290 301
291 $self->set_channel ($self->{channel}); 302 $self->set_channel ($self->{channel});
292 303
293 $self->show_all; 304 $self->show_all;
294 305
… …
316 } 327 }
317 }); 328 });
318 } 329 }
319} 330}
320 331
332### JOIN/LEAVE ##############################################################
333
334sub join {
335 my ($self) = @_;
336 return if $self->{joined};
337
338 $self->SUPER::join;
339}
340
341sub part {
342 my ($self) = @_;
343
344 $self->hide;
345 $self->SUPER::part;
346}
347
348sub event_join {
349 my ($self) = @_;
350
351 $self->SUPER::event_join (@_);
352 $self->init_tree;
353 $self->event_update_game;
354}
355
356sub event_part {
357 my ($self) = @_;
358
359 $self->SUPER::event_part;
360 $self->destroy;
361}
362
363sub event_quit {
364 my ($self) = @_;
365
366 $self->SUPER::event_quit;
367 $self->destroy;
368}
369
370### USERS ###################################################################
371
372sub draw_users {
373 my ($self, $inlay) = @_;
374
375 for (sort keys %{$self->{users}}) {
376 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
377 }
378}
379
321sub event_update_users { 380sub event_update_users {
322 my ($self, $add, $update, $remove) = @_; 381 my ($self, $add, $update, $remove) = @_;
323 382
324# $self->{userlist}->update ($add, $update, $remove); 383# $self->{userlist}->update ($add, $update, $remove);
325 384
… …
332 $important{$self->{black}{name}}++; 391 $important{$self->{black}{name}}++;
333 $important{$self->{white}{name}}++; 392 $important{$self->{white}{name}}++;
334 $important{$self->{owner}{name}}++; 393 $important{$self->{owner}{name}}++;
335 394
336 if (my @users = grep $important{$_->{name}}, @$add) { 395 if (my @users = grep $important{$_->{name}}, @$add) {
337 $self->{chat}->append_text ("\n<header>Joins:</header>"); 396 $self->{chat}->append_text ("\n<leader>Joins:</leader>");
338 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 397 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
339 } 398 }
340 if (my @users = grep $important{$_->{name}}, @$remove) { 399 if (my @users = grep $important{$_->{name}}, @$remove) {
341 $self->{chat}->append_text ("\n<header>Parts:</header>"); 400 $self->{chat}->append_text ("\n<leader>Parts:</leader>");
342 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 401 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
343 } 402 }
344} 403}
345 404
346sub join { 405### GAME INFO ###############################################################
406
407sub draw_setup {
347 my ($self) = @_; 408 my ($self, $inlay) = @_;
409
348 return if $self->{joined}; 410 return unless $self->{joined};
349 411
350 $self->SUPER::join; 412 my $rules = $self->{rules};
413
414 my $text = "";
415
416 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
417 if $self->{teacher};
418
419 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
420 if $self->{owner}->is_valid;
421
422 if ($self->is_inprogress) {
423 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
424 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
425 }
426 $text .= "\nType: " . util::toxml $gametype{$self->type};
427
428 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
429
430 $text .= "\nTime: ";
431
432 if ($rules->{timesys} == TIMESYS_NONE) {
433 $text .= "UNLIMITED";
434 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
435 $text .= util::format_time $rules->{time};
436 $text .= " ABS";
437 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
438 $text .= util::format_time $rules->{time};
439 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
440 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
441 $text .= util::format_time $rules->{time};
442 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
443 }
444
445 $text .= "\nFlags:";
446 $text .= " private" if $self->is_private;
447 $text .= " started" if $self->is_inprogress;
448 $text .= " adjourned" if $self->is_adjourned;
449 $text .= " scored" if $self->is_scored;
450 $text .= " saved" if $self->is_saved;
451
452 if ($self->is_inprogress) {
453 $text .= "\nHandicap: " . $self->{handicap};
454 $text .= "\nKomi: " . $self->{komi};
455 $text .= "\nSize: " . $self->size_string;
456 }
457
458 if ($self->is_scored) {
459 $text .= "\nResult: " . $self->score_string;
460 }
461
462 $inlay->append_text ("<infoblock>$text</infoblock>");
463
464}
465
466sub event_update_game {
467 my ($self) = @_;
468
469 $self->SUPER::event_update_game;
470
471 return unless $self->{joined};
472
473 $self->{colour} = $self->player_colour ($self->{conn}{name});
474
475 $self->{user}[COLOUR_BLACK] = $self->{black};
476 $self->{user}[COLOUR_WHITE] = $self->{white};
477
478 # show board
479 if ($self->is_inprogress) {
480 if (!$self->{board}) {
481 $self->{left}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
482 $self->{board}->signal_connect (button_release => sub {
483 return unless $self->{cur_board};
484 if ($_[1] == 1) {
485 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
486 }
487 });
488 $self->{board}->show_all;
489 }
490 if (my $ch = delete $self->{challenge}) {
491 $_->{inlay}->destroy for values %$ch;
492 }
493 $self->update_cursor;
494 }
495
496 my $title = defined $self->{channel}
497 ? $self->owner->as_string . " " . $self->opponent_string
498 : "Game Window";
499 $self->set_title ("KGS Game $title");
500 $self->{title}->set_text ($title); # title gets redrawn wrongly
501
502 $self->{rules_inlay}->refresh;
503
504 if (exists $self->{teacher}) {
505 $self->{teacher_inlay} ||= $self->{chat}->new_inlay;
506 $self->{teacher_inlay}->clear;
507 $self->{teacher_inlay}->append_text ("\n<header>Teacher:</header> <user>"
508 . (util::toxml $self->{teacher}) . "</user>");
509 } elsif ($self->{teacher_inlay}) {
510 (delete $self->{teacher_inlay})->clear;
511 }
512
513 $self->update_cursor;
514}
515
516sub event_update_rules {
517 my ($self, $rules) = @_;
518
519 $self->{rules} = $rules;
520
521 if ($self->{user}) {
522 # todo. gets drawn wrongly
523
524 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
525 for COLOUR_BLACK, COLOUR_WHITE;
526 }
527
528 sound::play 3, "gamestart";
529 $self->{rules_inlay}->refresh;
530}
531
532### BOARD DISPLAY ###########################################################
533
534sub update_timers {
535 my ($self, $timers) = @_;
536
537 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
538
539 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
540 my $t = $timers->[$colour];
541 $self->{userpanel}[$colour]->set_timer (
542 $running && $colour == $self->{whosemove} && $t->[0],
543 $t->[1] || $self->{rules}{time}
544 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
545 && $self->{rules}{interval} * $self->{rules}{count}),
546 $t->[2]);
547 }
548}
549
550sub inject_set_gametime {
551 my ($self, $msg) = @_;
552
553 $self->{timers} = [
554 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
555 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
556 ];
557
558 $self->update_timers ($self->{timers})
559 if $self->{showmove} == @{$self->{path}};
351} 560}
352 561
353sub update_cursor { 562sub update_cursor {
354 my ($self) = @_; 563 my ($self) = @_;
564
565 return unless $self->{cur_board};
355 566
356 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active; 567 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
357 568
358 delete $self->{board_click}; 569 delete $self->{board_click};
359 570
… …
393 604
394 } elsif ($self->{colour} == $self->{whosemove}) { 605 } elsif ($self->{colour} == $self->{whosemove}) {
395 # normal move 606 # normal move
396 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1); 607 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
397 $self->{board}->set (cursor => sub { 608 $self->{board}->set (cursor => sub {
398 # if is_valid_move oder so#TODO# 609 $self->{cur_board}
399 $_[0] & (MARK_B | MARK_W) 610 && $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
400 ? $_[0] 611 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
401 : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B); 612 ? $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
613 : $_[0];
402 }); 614 });
403 $self->{board_click} = sub { 615 $self->{board_click} = sub {
616 return unless
617 $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
618 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND);
404 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]); 619 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
405 $self->{board}->set (cursor => undef); 620 $self->{board}->set (cursor => undef);
406 delete $self->{board_click}; 621 delete $self->{board_click};
407 $self->{button_pass}->sensitive (0); 622 $self->{button_pass}->sensitive (0);
408 }; 623 };
… …
417 $self->{board}->set (cursor => undef); 632 $self->{board}->set (cursor => undef);
418 #TODO# # implement coordinate-grabbing 633 #TODO# # implement coordinate-grabbing
419 } 634 }
420} 635}
421 636
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 { 637sub update_board {
439 my ($self) = @_; 638 my ($self) = @_;
639
440 return unless $self->{path}; 640 return unless $self->{path};
441 641
442 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1)); 642 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
443 643
444 $self->{cur_board} = new KGS::Game::Board $self->{size}; 644 $self->{cur_board} = new KGS::Game::Board $self->{size};
445 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]); 645 $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 646
450 if ($self->{rules}{ruleset} == RULESET_JAPANESE) { 647 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
451 if ($self->{curnode}{move} == 0) { 648 if ($self->{curnode}{move} == 0) {
452 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK; 649 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
453 } else { 650 } else {
… …
456 } else { 653 } else {
457 # Chinese, Aga, NZ all have manual placement 654 # Chinese, Aga, NZ all have manual placement
458 if ($self->{curnode}{move} < $self->{handicap}) { 655 if ($self->{curnode}{move} < $self->{handicap}) {
459 $self->{whosemove} = COLOUR_BLACK; 656 $self->{whosemove} = COLOUR_BLACK;
460 } elsif ($self->{curnode}{move} == $self->{handicap}) { 657 } elsif ($self->{curnode}{move} == $self->{handicap}) {
461 $self->{whosemove} = COLOUR_WHITE; 658 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
462 } else { 659 } else {
463 $self->{whosemove} = 1 - $self->{cur_board}{last}; 660 $self->{whosemove} = 1 - $self->{cur_board}{last};
464 } 661 }
465 } 662 }
663
664 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
665 for COLOUR_WHITE, COLOUR_BLACK;
466 666
467 my $start_time = $self->{rules}{time}; 667 my $start_time = $self->{rules}{time};
468 668
469 if ($self->{showmove} == @{$self->{path}}) { 669 if ($self->{showmove} == @{$self->{path}}) {
470 $self->{timers} = [ 670 $self->{timers} = [
… …
492 } elsif ($self->{score_inlay}) { 692 } elsif ($self->{score_inlay}) {
493 (delete $self->{score_inlay})->clear; 693 (delete $self->{score_inlay})->clear;
494 } 694 }
495 695
496 $self->update_cursor; 696 $self->update_cursor;
697
497} 698}
498 699
499sub event_update_tree { 700sub event_update_tree {
500 my ($self) = @_; 701 my ($self) = @_;
501 702
… …
554 } 755 }
555 756
556 $self->{chat}->append_text ($text); 757 $self->{chat}->append_text ($text);
557} 758}
558 759
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 { 760sub event_move {
575 my ($self, $pass) = @_; 761 my ($self, $pass) = @_;
576 762
577 sound::play 1, $pass ? "pass" : "move"; 763 sound::play 1, $pass ? "pass" : "move";
578} 764}
579 765
580sub event_update_game { 766### 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 767
694sub event_resign_game { 768sub event_resign_game {
695 my ($self, $player) = @_; 769 my ($self, $player) = @_;
696 770
697 sound::play 3, "resign"; 771 sound::play 3, "resign";
698 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 772 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
699 . "\n<user>" 773 . "\n<user>"
700 . (util::toxml $self->{user}[$msg->{player}]->as_string) 774 . (util::toxml $self->{user}[$msg->{player}]->as_string)
701 . "</user> resigned.</infoblock>"); 775 . "</user> resigned."
776 . "\n<user>"
777 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
778 . "</user> wins the game."
779 . "</infoblock>");
702} 780}
703 781
704sub event_out_of_time { 782sub event_time_win {
705 my ($self, $player) = @_; 783 my ($self, $player) = @_;
706 784
707 sound::play 3, "timewin"; 785 sound::play 3, "timewin";
708 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>" 786 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
709 . "\n<user>" 787 . "\n<user>"
788 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
789 . "</user> ran out of time and lost."
790 . "\n<user>"
710 . (util::toxml $self->{user}[$msg->{player}]->as_string) 791 . (util::toxml $self->{user}[$msg->{player}]->as_string)
792 . "</user> wins the game."
793 . "</infoblock>");
794}
795
796sub event_owner_left {
797 my ($self) = @_;
798
799 $self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
711 . "</user> ran out of time and lost.</infoblock>"); 800 . "\nThe owner of this game left.</infoblock>");
801}
802
803sub event_teacher_left {
804 my ($self) = @_;
805
806 $self->{chat}->append_text ("\n<infoblock><header>Teacher left</header>"
807 . "\nThe teacher left the game.</infoblock>");
712} 808}
713 809
714sub event_done { 810sub event_done {
715 my ($self) = @_; 811 my ($self) = @_;
716 812
… …
736 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>" 832 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
737 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 833 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
738 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 834 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
739 . "</infoblock>" 835 . "</infoblock>"
740 ); 836 );
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} 837}
754 838
755sub inject_req_undo { 839sub inject_req_undo {
756 my ($self, $msg) = @_; 840 my ($self, $msg) = @_;
757 841
… …
786 870
787 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>"); 871 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
788 delete $self->{cid}; 872 delete $self->{cid};
789} 873}
790 874
875### CHALLENGE HANDLING ######################################################
876
791sub draw_challenge { 877sub draw_challenge {
792 my ($self, $id) = @_; 878 my ($self, $id) = @_;
793 879
794 my $info = $self->{challenge}{$id}; 880 my $info = $self->{challenge}{$id};
795 my $inlay = $info->{inlay}; 881 my $inlay = $info->{inlay};
… …
800 886
801 my ($size, $time, $interval, $count, $type); 887 my ($size, $time, $interval, $count, $type);
802 888
803 if (!$self->{channel}) { 889 if (!$self->{channel}) {
804 $inlay->append_text ("\nNotes: "); 890 $inlay->append_text ("\nNotes: ");
805 $inlay->append_entry (\$info->{notes}, 20, ""); 891 $inlay->append_widget (gtk::textentry \$info->{notes}, 20, "");
806 $inlay->append_text ("\nGlobal Offer: "); 892 $inlay->append_text ("\nGlobal Offer: ");
807 $inlay->append_optionmenu (\$info->{flags}, 893 $inlay->append_optionmenu (\$info->{flags},
808 0 => "No", 894 0 => "No",
809 2 => "Yes", 895 2 => "Yes",
810 ); 896 );
… …
863 if ($self->{channel}) { 949 if ($self->{channel}) {
864 $inlay->append_text ("\nHandicap: "); 950 $inlay->append_text ("\nHandicap: ");
865 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9); 951 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
866 952
867 $inlay->append_text ("\nKomi: "); 953 $inlay->append_text ("\nKomi: ");
868 $inlay->append_entry (\$info->{rules}{komi}, 5); 954 $inlay->append_widget (gtk::numentry \$info->{rules}{komi}, 5);
869 } 955 }
870 956
871 $inlay->append_text ("\nTimesys: "); 957 $inlay->append_text ("\nTimesys: ");
872 $inlay->append_optionmenu ( 958 $inlay->append_optionmenu (
873 \$info->{rules}{timesys}, 959 \$info->{rules}{timesys},
… …
902 } 988 }
903 } 989 }
904 ); 990 );
905 991
906 $inlay->append_text ("\nMain Time: "); 992 $inlay->append_text ("\nMain Time: ");
907 $time = $inlay->append_entry (\$info->{rules}{time}, 5); 993 $time = $inlay->append_widget (gtk::timeentry \$info->{rules}{time}, 5);
908 $inlay->append_text ("\nInterval: "); 994 $inlay->append_text ("\nInterval: ");
909 $interval = $inlay->append_entry (\$info->{rules}{interval}, 3); 995 $interval = $inlay->append_widget (gtk::timeentry \$info->{rules}{interval}, 5);
910 $inlay->append_text ("\nPeriods/Stones: "); 996 $inlay->append_text ("\nPeriods/Stones: ");
911 $count = $inlay->append_entry (\$info->{rules}{count}, 2); 997 $count = $inlay->append_widget (gtk::numentry \$info->{rules}{count}, 5);
912 998
913 $inlay->append_text ("\n"); 999 $inlay->append_text ("\n");
914 1000
915 if (!$self->{channel}) { 1001 if (!$self->{channel}) {
916 $inlay->append_button ("Create Challenge", sub { 1002 $inlay->append_button ("Create Challenge", sub {
… …
950 }); 1036 });
951 } 1037 }
952 } 1038 }
953} 1039}
954 1040
955sub draw_users { 1041sub new_game_challenge {
956 my ($self, $inlay) = @_; 1042 my ($self) = @_;
957 1043
958 for (sort keys %{$self->{users}}) { 1044 my $d = $self->{app}{defaults};
959 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>"); 1045
1046 $self->{challenge}{""} = {
1047 gametype => $d->{gametype},
1048 flags => 0,
1049 notes => $d->{stones},
1050 rules => {
1051 ruleset => $d->{ruleset},
1052 size => $d->{size},
1053 timesys => $d->{timesys},
1054 time => $d->{time},
1055 interval => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_time} : $d->{can_time},
1056 count => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_periods} : $d->{can_stones},
1057 },
1058
1059 inlay => $self->{chat}->new_inlay,
960 } 1060 };
1061 $self->draw_challenge ("");
961} 1062}
962 1063
963sub event_challenge { 1064sub event_challenge {
964 my ($self, $info) = @_; 1065 my ($self, $info) = @_;
965 1066
… …
971 sound::play 2, "info"; 1072 sound::play 2, "info";
972 1073
973 $self->{challenge}{$id} = $info; 1074 $self->{challenge}{$id} = $info;
974 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay ( 1075 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
975 exists $self->{challenge}{""} 1076 exists $self->{challenge}{""}
976 ? "Challenge from $opponent->{name}" 1077 ? "Challenge from " . $opponent->as_string
977 : "Challenge to $opponent->{name}", 1078 : "Challenge to " . $opponent->as_string,
978 sub { 1079 sub {
979 $self->{challenge}{$id}{inlay} = $_[0]; 1080 $self->{challenge}{$id}{inlay} = $_[0];
980 $self->draw_challenge ($id); 1081 $self->draw_challenge ($id);
981 }, 1082 },
982 !exists $self->{challenge}{""} # only open when not offerer 1083 !exists $self->{challenge}{""} # only open when not offerer

Diff Legend

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