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.104 by pcg, Sun May 30 07:24:06 2004 UTC vs.
Revision 1.119 by root, Tue Jun 1 23:14:06 2004 UTC

1use utf8; 1use utf8;
2 2
3use Scalar::Util (); 3use Scalar::Util ();
4
5### GO CLOCK WIDGET #########################################################
4 6
5package game::goclock; 7package game::goclock;
6 8
7# Lo and Behold! I admit it! The rounding stuff etc.. in goclock 9# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
8# is completely borked. 10# is completely borked.
21 23
22 $self->{set} = sub { }; 24 $self->{set} = sub { };
23 $self->{format} = sub { "???" }; 25 $self->{format} = sub { "???" };
24} 26}
25 27
28sub FINALIZE_INSTANCE {
29 my $self = shift;
30
31 $self->stop;
32}
33
26sub configure { 34sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_; 35 my ($self, $timesys, $main, $interval, $count) = @_;
28 36
29 if ($timesys == TIMESYS_ABSOLUTE) { 37 if ($timesys == TIMESYS_ABSOLUTE) {
30 $self->{set} = sub { $self->{time} = $_[0] }; 38 $self->{format} = sub {
31 $self->{format} = sub { util::format_time $_[0] }; 39 if ($_[0] < 0) {
40 "TIMEOUT";
41 } else {
42 util::format_time $_[0];
43 }
44 };
32 45
33 } elsif ($timesys == TIMESYS_BYO_YOMI) { 46 } elsif ($timesys == TIMESYS_BYO_YOMI) {
34 my $low = $interval * $count; 47 my $low = $interval * $count;
35 48
36 $self->{set} = sub { $self->{time} = $_[0] };
37
38 $self->{format} = sub { 49 $self->{format} = sub {
50 if ($_[0] < 0) {
51 "TIMEOUT";
39 if ($_[0] > $low) { 52 } elsif ($_[0] > $low) {
40 util::format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
41 } else { 54 } else {
42 sprintf "%s (%d)", 55 sprintf "%s (%d)",
43 util::format_time int (($_[0] - 1) % $interval + 1), 56 util::format_time int (($_[0] - 1) % $interval + 1),
44 ($_[0] - 1) / $interval; 57 ($_[0] - 1) / $interval;
45 } 58 }
46 }; 59 };
47 60
48 } elsif ($timesys == TIMESYS_CANADIAN) { 61 } elsif ($timesys == TIMESYS_CANADIAN) {
49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
50
51 $self->{format} = sub { 62 $self->{format} = sub {
63 if ($_[0] < 0) {
64 "TIMEOUT";
52 if (!$self->{moves}) { 65 } elsif (!$self->{moves}) {
53 util::format_time $_[0] - $low; 66 util::format_time $_[0] - $low;
54 } else { 67 } else {
55 my $time = int (($_[0] - 1) % $interval + 1); 68 my $time = int (($_[0] - 1) % $interval + 1);
56 69
57 sprintf "%s/%d =%d", 70 sprintf "%s/%d =%d",
63 } 76 }
64 }; 77 };
65 78
66 } else { 79 } else {
67 # none, or unknown 80 # none, or unknown
68 $self->{set} = sub { };
69 $self->{format} = sub { "---" } 81 $self->{format} = sub { "-" }
70 } 82 }
71} 83}
72 84
73sub refresh { 85sub refresh {
74 my ($self, $timestamp) = @_; 86 my ($self, $timestamp) = @_;
76 88
77 # we round the timer value slightly... the protocol isn't exact anyways, 89 # we round the timer value slightly... the protocol isn't exact anyways,
78 # and this gives smoother timers ;) 90 # and this gives smoother timers ;)
79 my $timer2 = int $timer + 0.4; 91 my $timer2 = int $timer + 0.4;
80 92
81 if ($timer2 <= 0) { 93 $self->set_text ($self->{format}->($timer2));
82 $timer2 = 0 if $timer2 < 0; 94
83 $self->set_text ("TIME OUT"); 95 $timer - int $timer;
96}
97
98sub set_time {
99 my ($self, $start, $time, $moves) = @_;
100
101 $self->{time} = $time;
102 $self->{moves} = $moves;
103
104 if ($start) {
105 $self->{start} = $start;
106 $self->start;
84 } else { 107 } else {
85 $self->set_text ($self->{format}->($timer2)); 108 $self->stop;
86 }
87
88 $timer - int $timer;
89}
90
91sub set_time {
92 my ($self, $time, $moves) = @_;
93
94 # we ignore requests to re-set the time of a running clock.
95 # this is the easiest way to ensure that commentary etc.
96 # doesn't re-set the clock. yes, this is frickle design,
97 # but I think the protocol is to blame here, which gives
98 # very little time information. (cgoban2 also has had quite
99 # a lot of small time update problems...)
100 unless ($self->{timeout}) {
101 $self->{set}->($time, $moves);
102 $self->refresh ($self->{start}); 109 $self->refresh ($self->{start});
103 } 110 }
104} 111}
105 112
106sub start { 113sub start {
107 my ($self, $when) = @_; 114 my ($self) = @_;
108 115
109 $self->stop; 116 $self->stop;
110
111 $self->{start} = $when;
112 117
113 my $timeout; $timeout = sub { 118 my $timeout; $timeout = sub {
114 my $next = $self->refresh (Time::HiRes::time) * 1000; 119 my $next = $self->refresh (Time::HiRes::time) * 1000;
115 $next += 1000 if $next < 0; 120 $next += 1000 if $next < 0;
116 $self->{timeout} = add Glib::Timeout $next, $timeout; 121 $self->{timeout} = add Glib::Timeout $next, $timeout;
124 my ($self) = @_; 129 my ($self) = @_;
125 130
126 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 131 remove Glib::Source delete $self->{timeout} if $self->{timeout};
127} 132}
128 133
134### USER PANEL ##############################################################
135
129package game::userpanel; 136package game::userpanel;
130 137
138use KGS::Constants;
139
131use Glib::Object::Subclass 140use Glib::Object::Subclass
132 Gtk2::HBox, 141 Gtk2::Frame,
133 properties => [ 142 properties => [
134 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)]),
135 ]; 146 ];
136 147
137sub INIT_INSTANCE { 148sub INIT_INSTANCE {
138 my ($self) = @_; 149 my ($self) = @_;
139 150
140 $self->add (my $vbox = new Gtk2::VBox); 151 $self->add (my $vbox = new Gtk2::VBox);
141 152
142 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 153 $vbox->pack_start (($self->{name} = new Gtk2::Label "-"), 1, 1, 0);
143 $vbox->add ($self->{info} = new Gtk2::Label ""); 154 $vbox->pack_start (($self->{info} = new Gtk2::Label "-"), 1, 1, 0);
144 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock}; 155 $vbox->pack_start (($self->{clock} = new game::goclock), 1, 1, 0);
145 156
146 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 157 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
147 158
148 $self; 159 $self;
149} 160}
180 191
181 $self->{info}->set_text ("$captures pris."); 192 $self->{info}->set_text ("$captures pris.");
182} 193}
183 194
184sub set_timer { 195sub set_timer {
185 my ($self, $when, $time, $moves) = @_; 196 my ($self, $start, $time, $moves) = @_;
186 197
187 $self->{clock}->stop unless $when;
188 $self->{clock}->set_time ($time, $moves); 198 $self->{clock}->set_time ($start, $time, $moves);
189 $self->{clock}->start ($when) if $when;
190} 199}
200
201### GAME WINDOW #############################################################
191 202
192package game; 203package game;
193 204
194use Scalar::Util qw(weaken); 205use Scalar::Util qw(weaken);
195 206
225 236
226 # LEFT PANE 237 # LEFT PANE
227 238
228 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0); 239 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
229 240
230 $self->{boardbox} = new Gtk2::VBox;
231
232 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 241 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
233 242
234 # board box (aspect/canvas) 243 # board box (aspect/canvas)
235 244
236 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
237
238 # RIGHT PANE 245 # RIGHT PANE
239 246
240 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1); 247 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
241 $hpane->set (position_set => 1); 248 $hpane->set (position_set => 1);
242 249
243 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0); 250 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
244 251
245 { 252 {
246 $frame->add (my $vbox = new Gtk2::VBox); 253 $frame->add (my $vbox = new Gtk2::VBox);
247 $vbox->add ($self->{title} = new Gtk2::Label $title); 254 $vbox->add ($self->{title} = new Gtk2::Label "-");
248 255
249 $vbox->add (my $hbox = new Gtk2::HBox); 256 $vbox->add (my $hbox = new Gtk2::HBox);
250 257
251 $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);
252 259
253 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 260 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
254 261
255 $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);
256 $scale->set_draw_value (0); 263 $scale->set_draw_value (0);
268 for COLOUR_WHITE, COLOUR_BLACK; 275 for COLOUR_WHITE, COLOUR_BLACK;
269 276
270 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0); 277 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
271 278
272 $buttonbox->add ($self->{button_pass} = 279 $buttonbox->add ($self->{button_pass} =
273 Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0)); 280 Gtk2::Button->Glib::Object::new (label => "Pass", visible => 0));
274 $self->{button_pass}->signal_connect (clicked => sub { 281 $self->{button_pass}->signal_connect (clicked => sub {
275 $self->{board_click}->(255, 255) if $self->{board_click}; 282 $self->{board_click}->(255, 255) if $self->{board_click};
276 }); 283 });
284 eval { $self->{button_pass}->set (no_show_all => 1) }; # workaround for gtk+-2.2
277 $buttonbox->add ($self->{button_undo} = 285 $buttonbox->add ($self->{button_undo} =
278 Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0)); 286 Gtk2::Button->Glib::Object::new (label => "Undo", visible => 0));
279 $self->{button_undo}->signal_connect (clicked => sub { 287 $self->{button_undo}->signal_connect (clicked => sub {
280 $self->send (req_undo => channel => $self->{channel}); 288 $self->send (req_undo => channel => $self->{channel});
281 }); 289 });
290 eval { $self->{button_undo}->set (no_show_all => 1) }; # workaround for gtk+-2.2
282 $buttonbox->add ($self->{button_resign} = 291 $buttonbox->add ($self->{button_resign} =
283 Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0)); 292 Gtk2::Button->Glib::Object::new (label => "Resign", visible => 0));
284 $self->{button_resign}->signal_connect (clicked => sub { 293 $self->{button_resign}->signal_connect (clicked => sub {
285 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour}); 294 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
286 }); 295 });
296 eval { $self->{button_resign}->set (no_show_all => 1) }; # workaround for gtk+-2.2
287 297
288 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0); 298 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
289 299
290 $self->set_channel ($self->{channel}); 300 $self->set_channel ($self->{channel});
291 301
315 } 325 }
316 }); 326 });
317 } 327 }
318} 328}
319 329
330### JOIN/LEAVE ##############################################################
331
332sub join {
333 my ($self) = @_;
334 return if $self->{joined};
335
336 $self->SUPER::join;
337}
338
339sub event_join {
340 my ($self) = @_;
341
342 $self->SUPER::event_join (@_);
343 $self->init_tree;
344 $self->event_update_game;
345}
346
347sub event_part {
348 my ($self) = @_;
349
350 $self->SUPER::event_part;
351 $self->destroy;
352}
353
354sub event_quit {
355 my ($self) = @_;
356
357 $self->SUPER::event_quit;
358 $self->destroy;
359}
360
361### USERS ###################################################################
362
363sub draw_users {
364 my ($self, $inlay) = @_;
365
366 for (sort keys %{$self->{users}}) {
367 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
368 }
369}
370
320sub event_update_users { 371sub event_update_users {
321 my ($self, $add, $update, $remove) = @_; 372 my ($self, $add, $update, $remove) = @_;
322 373
323# $self->{userlist}->update ($add, $update, $remove); 374# $self->{userlist}->update ($add, $update, $remove);
324 375
340 $self->{chat}->append_text ("\n<header>Parts:</header>"); 391 $self->{chat}->append_text ("\n<header>Parts:</header>");
341 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 392 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
342 } 393 }
343} 394}
344 395
345sub join { 396### GAME INFO ###############################################################
397
398sub draw_setup {
346 my ($self) = @_; 399 my ($self, $inlay) = @_;
400
347 return if $self->{joined}; 401 return unless $self->{joined};
348 402
349 $self->SUPER::join; 403 my $rules = $self->{rules};
404
405 my $text = "";
406
407 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
408 if $self->{teacher};
409
410 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
411 if $self->{owner}->is_valid;
412
413 if ($self->is_inprogress) {
414 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
415 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
416 }
417 $text .= "\nType: " . util::toxml $gametype{$self->type};
418
419 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
420
421 $text .= "\nTime: ";
422
423 if ($rules->{timesys} == TIMESYS_NONE) {
424 $text .= "UNLIMITED";
425 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
426 $text .= util::format_time $rules->{time};
427 $text .= " ABS";
428 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
429 $text .= util::format_time $rules->{time};
430 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
431 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
432 $text .= util::format_time $rules->{time};
433 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
434 }
435
436 $text .= "\nFlags:";
437 $text .= " private" if $self->is_private;
438 $text .= " started" if $self->is_inprogress;
439 $text .= " adjourned" if $self->is_adjourned;
440 $text .= " scored" if $self->is_scored;
441 $text .= " saved" if $self->is_saved;
442
443 if ($self->is_inprogress) {
444 $text .= "\nHandicap: " . $self->{handicap};
445 $text .= "\nKomi: " . $self->{komi};
446 $text .= "\nSize: " . $self->size_string;
447 }
448
449 if ($self->is_scored) {
450 $text .= "\nResult: " . $self->score_string;
451 }
452
453 $inlay->append_text ("<infoblock>$text</infoblock>");
454
455}
456
457sub event_update_game {
458 my ($self) = @_;
459
460 $self->SUPER::event_update_game;
461
462 return unless $self->{joined};
463
464 $self->{colour} = $self->player_colour ($self->{conn}{name});
465
466 $self->{user}[COLOUR_BLACK] = $self->{black};
467 $self->{user}[COLOUR_WHITE] = $self->{white};
468
469 # show board
470 if ($self->is_inprogress) {
471 if (!$self->{board}) {
472 $self->{left}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
473 $self->{board}->signal_connect (button_release => sub {
474 return unless $self->{cur_board};
475 if ($_[1] == 1) {
476 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
477 }
478 });
479 $self->{board}->show_all;
480 }
481 if (my $ch = delete $self->{challenge}) {
482 $_->{inlay}->destroy for values %$ch;
483 }
484 $self->update_cursor;
485 }
486
487 my $title = defined $self->{channel}
488 ? $self->owner->as_string . " " . $self->opponent_string
489 : "Game Window";
490 $self->set_title ("KGS Game $title");
491 $self->{title}->set_text ($title); # title gets redrawn wrongly
492
493 $self->{rules_inlay}->refresh;
494
495 if (exists $self->{teacher}) {
496 $self->{teacher_inlay} ||= $self->{chat}->new_inlay;
497 $self->{teacher_inlay}->clear;
498 $self->{teacher_inlay}->append_text ("\n<header>Teacher:</header> <user>"
499 . (util::toxml $self->{teacher}) . "</user>");
500 } elsif ($self->{teacher_inlay}) {
501 (delete $self->{teacher_inlay})->clear;
502 }
503
504 $self->update_cursor;
505}
506
507sub event_update_rules {
508 my ($self, $rules) = @_;
509
510 $self->{rules} = $rules;
511
512 if ($self->{user}) {
513 # todo. gets drawn wrongly
514
515 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
516 for COLOUR_BLACK, COLOUR_WHITE;
517 }
518
519 sound::play 3, "gamestart";
520 $self->{rules_inlay}->refresh;
521}
522
523### BOARD DISPLAY ###########################################################
524
525sub update_timers {
526 my ($self, $timers) = @_;
527
528 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
529
530 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
531 my $t = $timers->[$colour];
532 $self->{userpanel}[$colour]->set_timer (
533 $running && $colour == $self->{whosemove} && $t->[0],
534 $t->[1] || $self->{rules}{time}
535 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
536 && $self->{rules}{interval} * $self->{rules}{count}),
537 $t->[2]);
538 }
539}
540
541sub inject_set_gametime {
542 my ($self, $msg) = @_;
543
544 $self->{timers} = [
545 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
546 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
547 ];
548
549 $self->update_timers ($self->{timers})
550 if $self->{showmove} == @{$self->{path}};
350} 551}
351 552
352sub update_cursor { 553sub update_cursor {
353 my ($self) = @_; 554 my ($self) = @_;
555
556 return unless $self->{cur_board};
354 557
355 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active; 558 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
356 559
357 delete $self->{board_click}; 560 delete $self->{board_click};
358 561
359 if ($self->{teacher} eq $self->{app}{conn}) { 562 if ($self->{teacher} eq $self->{app}{conn}) {
360 #TODO# # teaching mode not implemented 563 #TODO# # teaching mode not implemented
361 $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1); 564 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
362 $self->{button_undo}->hide; 565 $self->{button_undo}->hide;
363 $self->{button_resign}->hide; 566 $self->{button_resign}->hide;
364 $self->{board}->set (cursor => undef); 567 $self->{board}->set (cursor => undef);
365 568
366 } elsif ($running && $self->{colour} != COLOUR_NONE) { 569 } elsif ($running && $self->{colour} != COLOUR_NONE) {
368 $self->{button_undo}->show; 571 $self->{button_undo}->show;
369 $self->{button_resign}->show; 572 $self->{button_resign}->show;
370 573
371 if ($self->{cur_board}{score}) { 574 if ($self->{cur_board}{score}) {
372 # during scoring 575 # during scoring
373 $self->{button_pass}->set (label => "Done", sensitive => 1, visible => 1); 576 $self->{button_pass}->set (label => "Done", visible => 1, sensitive => 1);
374 $self->{board}->set (cursor => sub { 577 $self->{board}->set (cursor => sub {
375 $_[0] & (MARK_B | MARK_W) 578 $_[0] & (MARK_B | MARK_W)
376 ? $_[0] ^ MARK_GRAYED 579 ? $_[0] ^ MARK_GRAYED
377 : $_[0]; 580 : $_[0];
378 }); 581 });
388 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED), 591 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
389 ); 592 );
390 } 593 }
391 }; 594 };
392 595
393 } elsif (1 - $self->{colour} == $self->{cur_board}{last}) { 596 } elsif ($self->{colour} == $self->{whosemove}) {
394 # normal move 597 # normal move
395 $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1); 598 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
396 $self->{board}->set (cursor => sub { 599 $self->{board}->set (cursor => sub {
397 # if is_valid_move oder so#TODO# 600 $self->{cur_board}
398 $_[0] & (MARK_B | MARK_W) 601 && $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
399 ? $_[0] 602 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
400 : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B); 603 ? $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
604 : $_[0];
401 }); 605 });
402 $self->{board_click} = sub { 606 $self->{board_click} = sub {
607 return unless
608 $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
609 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND);
403 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]); 610 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
404 $self->{board}->set (cursor => undef); 611 $self->{board}->set (cursor => undef);
405 delete $self->{board_click}; 612 delete $self->{board_click};
406 $self->{button_pass}->sensitive (0); 613 $self->{button_pass}->sensitive (0);
407 }; 614 };
408 } else { 615 } else {
409 $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1); 616 $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
617 $self->{board}->set (cursor => undef);
410 } 618 }
411 } else { 619 } else {
412 $self->{button_undo}->hide; 620 $self->{button_undo}->hide;
413 $self->{button_resign}->hide; 621 $self->{button_resign}->hide;
414 $self->{button_pass}->hide; 622 $self->{button_pass}->hide;
415 $self->{board}->set (cursor => undef); 623 $self->{board}->set (cursor => undef);
416 #TODO# # implement coordinate-grabbing 624 #TODO# # implement coordinate-grabbing
417 } 625 }
418} 626}
419 627
420sub update_timers {
421 my ($self, $timers) = @_;
422
423 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
424
425 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
426 my $t = $timers->[$colour];
427 $self->{userpanel}[$colour]->set_timer (
428 $running && $self->{lastmove_colour} == 1 - $colour && $t->[0],
429 $t->[1], $t->[2]);
430 }
431}
432
433sub update_board { 628sub update_board {
434 my ($self) = @_; 629 my ($self) = @_;
630
435 return unless $self->{path}; 631 return unless $self->{path};
436 632
437 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1)); 633 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
438 634
439 $self->{cur_board} = new KGS::Game::Board $self->{size}; 635 $self->{cur_board} = new KGS::Game::Board $self->{size};
440 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]); 636 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
441 637
638 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
639 if ($self->{curnode}{move} == 0) {
640 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
641 } else {
642 $self->{whosemove} = 1 - $self->{cur_board}{last};
643 }
644 } else {
645 # Chinese, Aga, NZ all have manual placement
646 if ($self->{curnode}{move} < $self->{handicap}) {
647 $self->{whosemove} = COLOUR_BLACK;
648 } elsif ($self->{curnode}{move} == $self->{handicap}) {
649 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
650 } else {
651 $self->{whosemove} = 1 - $self->{cur_board}{last};
652 }
653 }
654
655 $self->update_cursor;
656
442 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_]) 657 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
443 for COLOUR_WHITE, COLOUR_BLACK; 658 for COLOUR_WHITE, COLOUR_BLACK;
659
660 my $start_time = $self->{rules}{time};
444 661
445 if ($self->{showmove} == @{$self->{path}}) { 662 if ($self->{showmove} == @{$self->{path}}) {
446 $self->{timers} = [ 663 $self->{timers} = [
447 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}], 664 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
448 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}], 665 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
455 ]); 672 ]);
456 } 673 }
457 674
458 $self->{board}->set_board ($self->{cur_board}); 675 $self->{board}->set_board ($self->{cur_board});
459 676
460 $self->update_cursor; 677 if ($self->{cur_board}{score}) {
678 $self->{score_inlay} ||= $self->{chat}->new_inlay;
679 $self->{score_inlay}->clear;
680 $self->{score_inlay}->append_text ("\n<header>Scoring</header>"
681 . "\n<score>"
682 . "White: $self->{cur_board}{score}[COLOUR_WHITE], "
683 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
684 . "</score>");
685 } elsif ($self->{score_inlay}) {
686 (delete $self->{score_inlay})->clear;
687 }
461} 688}
462 689
463sub event_update_tree { 690sub event_update_tree {
464 my ($self) = @_; 691 my ($self) = @_;
692
693 (delete $self->{undo_inlay})->clear
694 if $self->{undo_inlay};
465 695
466 $self->{path} = $self->get_path; 696 $self->{path} = $self->get_path;
467 697
468 if ($self->{moveadj}) { 698 if ($self->{moveadj}) {
469 my $upper = $self->{moveadj}->upper; 699 my $upper = $self->{moveadj}->upper;
515 } 745 }
516 746
517 $self->{chat}->append_text ($text); 747 $self->{chat}->append_text ($text);
518} 748}
519 749
520sub event_join {
521 my ($self) = @_;
522
523 $self->SUPER::event_join (@_);
524 $self->init_tree;
525 $self->event_update_game;
526}
527
528sub event_part {
529 my ($self) = @_;
530
531 $self->SUPER::event_part;
532 $self->destroy;
533}
534
535sub event_move { 750sub event_move {
536 my ($self, $pass) = @_; 751 my ($self, $pass) = @_;
752
537 sound::play 1, $pass ? "pass" : "move"; 753 sound::play 1, $pass ? "pass" : "move";
538
539 if ($self->{undo_inlay}) {
540 (delete $self->{undo_inlay})->clear;
541 }
542} 754}
543 755
544sub event_update_game { 756### GAMEPLAY EVENTS #########################################################
545 my ($self) = @_;
546
547 $self->SUPER::event_update_game;
548
549 return unless $self->{joined};
550
551 $self->{colour} = $self->player_colour ($self->{conn}{name});
552
553 my $title = defined $self->{channel}
554 ? $self->owner->as_string . " " . $self->opponent_string
555 : "Game Window";
556 $self->set_title ("KGS Game $title");
557 $self->{title}->set_text ($title);
558
559 $self->{user}[COLOUR_BLACK] = $self->{black};
560 $self->{user}[COLOUR_WHITE] = $self->{white};
561
562 # show board
563 if ($self->is_inprogress) {
564 if (!$self->{boardbox}->parent) {
565 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
566 $self->{left}->add ($self->{boardbox});
567 $self->{board}->signal_connect (button_release => sub {
568 if ($_[1] == 1) {
569 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
570 }
571 });
572 }
573 if (my $ch = delete $self->{challenge}) {
574 $_->{inlay}->destroy for values %$ch;
575 }
576 $self->update_cursor;
577 }
578
579 $self->{left}->show_all;
580
581 $self->{rules_inlay}->refresh;
582
583}
584
585sub draw_setup {
586 my ($self, $inlay) = @_;
587
588 return unless $self->{joined};
589
590 my $rules = $self->{rules};
591
592 my $text = "";
593
594 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
595 if $self->{teacher};
596
597 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
598 if $self->{owner}->is_valid;
599
600 if ($self->is_inprogress) {
601 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
602 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
603 }
604 $text .= "\nType: " . util::toxml $gametype{$self->type};
605
606 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
607
608 $text .= "\nTime: ";
609
610 if ($rules->{timesys} == TIMESYS_NONE) {
611 $text .= "UNLIMITED";
612 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
613 $text .= util::format_time $rules->{time};
614 $text .= " ABS";
615 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
616 $text .= util::format_time $rules->{time};
617 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
618 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
619 $text .= util::format_time $rules->{time};
620 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
621 }
622
623 $text .= "\nFlags:";
624 $text .= " private" if $self->is_private;
625 $text .= " started" if $self->is_inprogress;
626 $text .= " adjourned" if $self->is_adjourned;
627 $text .= " scored" if $self->is_scored;
628 $text .= " saved" if $self->is_saved;
629
630 if ($self->is_inprogress) {
631 $text .= "\nHandicap: " . $self->{handicap};
632 $text .= "\nKomi: " . $self->{komi};
633 $text .= "\nSize: " . $self->size_string;
634 }
635
636 if ($self->is_scored) {
637 $text .= "\nResult: " . $self->score_string;
638 }
639
640 $inlay->append_text ("<infoblock>$text</infoblock>");
641
642}
643
644sub event_update_rules {
645 my ($self, $rules) = @_;
646
647 $self->{rules} = $rules;
648
649 if ($self->{user}) {
650 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
651 for COLOUR_BLACK, COLOUR_WHITE;
652 }
653
654 sound::play 3, "gamestart";
655
656 $self->{rules_inlay}->refresh;
657}
658 757
659sub event_resign_game { 758sub event_resign_game {
660 my ($self, $player) = @_; 759 my ($self, $player) = @_;
661 760
662 sound::play 3, "resign"; 761 sound::play 3, "resign";
663 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 762 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
664 . "\n<user>" 763 . "\n<user>"
665 . (util::toxml $self->{user}[$msg->{player}]->as_string) 764 . (util::toxml $self->{user}[$msg->{player}]->as_string)
666 . "</user> resigned.</infoblock>"); 765 . "</user> resigned."
766 . "\n<user>"
767 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
768 . "</user> wins the game."
769 . "</infoblock>");
667} 770}
668 771
669sub event_out_of_time { 772sub event_time_win {
670 my ($self, $player) = @_; 773 my ($self, $player) = @_;
671 774
672 sound::play 3, "timewin"; 775 sound::play 3, "timewin";
673 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>" 776 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
674 . "\n<user>" 777 . "\n<user>"
778 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
779 . "</user> ran out of time and lost."
780 . "\n<user>"
675 . (util::toxml $self->{user}[$msg->{player}]->as_string) 781 . (util::toxml $self->{user}[$msg->{player}]->as_string)
782 . "</user> wins the game."
783 . "</infoblock>");
784}
785
786sub event_owner_left {
787 my ($self) = @_;
788
789 $self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
676 . "</user> ran out of time and lost.</infoblock>"); 790 . "\nThe owner of this game left.</infoblock>");
791}
792
793sub event_teacher_left {
794 my ($self) = @_;
795
796 $self->{chat}->append_text ("\n<infoblock><header>Teacher left</header>"
797 . "\nThe teacher left the game.</infoblock>");
677} 798}
678 799
679sub event_done { 800sub event_done {
680 my ($self) = @_; 801 my ($self) = @_;
681 802
682 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) { 803 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
804 sound::play 2, "info" unless $inlay->{count};
683 $self->{chat}->append_text ("\n<infoblock><header>Done</header>" 805 $self->{chat}->append_text ("\n<infoblock><header>Press Done</header>"
684 . "\nYour opponent pressed done."); 806 . "\nYour opponent pressed done. Now it's up to you.");
685 } 807 }
808 if ($self->{doneid} & 0x80000000) {
809 sound::play 2, "info" unless $inlay->{count};
810 $self->{chat}->append_text ("\n<infoblock><header>Press Done Again</header>"
811 . "\nThe board has changed.");
812 }
813
814 $self->{button_pass}->sensitive (!$self->{done}[$self->{colour}]);
815
816 $self->{chat}->set_end;
686} 817}
687 818
688sub inject_final_result { 819sub inject_final_result {
689 my ($self, $msg) = @_; 820 my ($self, $msg) = @_;
690 821
693 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 824 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
694 . "</infoblock>" 825 . "</infoblock>"
695 ); 826 );
696} 827}
697 828
698sub inject_set_gametime {
699 my ($self, $msg) = @_;
700
701 $self->{timers} = [
702 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
703 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
704 ];
705
706 print "SGT\n";#d#
707 $self->update_timers ($self->{timers})
708 if $self->{showmove} == @{$self->{path}};
709}
710
711sub inject_req_undo { 829sub inject_req_undo {
712 my ($self, $msg) = @_; 830 my ($self, $msg) = @_;
713 831
714 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay; 832 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
715 return if $inlay->{ignore}; 833 return if $inlay->{ignore};
716 834
717 sound::play 3, "warning" unless $inlay->{count}; 835 sound::play 2, "warning" unless $inlay->{count};
718 $inlay->{count}++; 836 $inlay->{count}++;
719 837
720 $inlay->clear; 838 $inlay->clear;
721 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n"); 839 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
722 $inlay->append_button ("Grant", sub { 840 $inlay->append_button ("Grant", sub {
723 $inlay->clear; 841 (delete $self->{undo_inlay})->clear;
724 $self->send (grant_undo => channel => $self->{channel}); 842 $self->send (grant_undo => channel => $self->{channel});
725 }); 843 });
726 $inlay->append_button ("Ignore", sub { 844 $inlay->append_button ("Ignore", sub {
727 $inlay->clear; 845 $inlay->clear;
728 $inlay->{ignore} = 1; 846 $inlay->{ignore} = 1;
733} 851}
734 852
735sub inject_new_game { 853sub inject_new_game {
736 my ($self, $msg) = @_; 854 my ($self, $msg) = @_;
737 855
738 $self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>"); 856 if ($msg->{cid} != $self->{cid}) {
857 $self->part;
858 warn "ERROR: challenge id mismatch, PLEASE REPORT, especially the circumstances (many games open? etc..)\n";#d#
859 }
860
861 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
739 delete $self->{cid}; 862 delete $self->{cid};
740} 863}
864
865### CHALLENGE HANDLING ######################################################
741 866
742sub draw_challenge { 867sub draw_challenge {
743 my ($self, $id) = @_; 868 my ($self, $id) = @_;
744 869
745 my $info = $self->{challenge}{$id}; 870 my $info = $self->{challenge}{$id};
747 my $rules = $info->{rules}; 872 my $rules = $info->{rules};
748 873
749 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;; 874 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
750 my $opponent = $as_black ? $info->{white} : $info->{black}; 875 my $opponent = $as_black ? $info->{white} : $info->{black};
751 876
752 my ($size, $time, $interval, $count); 877 my ($size, $time, $interval, $count, $type);
753 878
754 if (!$self->{channel}) { 879 if (!$self->{channel}) {
755 $inlay->append_text ("\nNotes: "); 880 $inlay->append_text ("\nNotes: ");
756 $inlay->append_entry (\$info->{notes}, 20, ""); 881 $inlay->append_entry (\$info->{notes}, 20, "");
757 $inlay->append_text ("\nGlobal Offer: "); 882 $inlay->append_text ("\nGlobal Offer: ");
762 } else { 887 } else {
763 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes}); 888 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
764 } 889 }
765 890
766 $inlay->append_text ("\nType: "); 891 $inlay->append_text ("\nType: ");
767 $inlay->append_optionmenu ( 892 $type = $inlay->append_optionmenu (
768 \$info->{gametype}, 893 \$info->{gametype},
769 GAMETYPE_DEMONSTRATION , "Demonstration", 894 GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
770 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)", 895 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
771 GAMETYPE_TEACHING , "Teaching", 896 GAMETYPE_TEACHING , "Teaching (not yet)",
772 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)", 897 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
773 GAMETYPE_SIMUL , "Simul (not yet!)", 898 GAMETYPE_SIMUL , "Simul (not yet!)",
774 GAMETYPE_FREE , "Free", 899 GAMETYPE_FREE , "Free",
775 GAMETYPE_RATED , "Rated", 900 GAMETYPE_RATED , "Rated",
776 sub { 901 sub {
777 $size->set_history (2) if $_[0] eq GAMETYPE_RATED; 902 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
801 RULESET_NEW_ZEALAND, "New Zealand", 926 RULESET_NEW_ZEALAND, "New Zealand",
802 ); 927 );
803 928
804 $inlay->append_text ("\nSize: "); 929 $inlay->append_text ("\nSize: ");
805 $size = $inlay->append_optionmenu ( 930 $size = $inlay->append_optionmenu (
931 \$info->{rules}{size},
806 \$info->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38 932 (9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38),
933 sub {
934 $type->set_history (5) # reset to free
935 if $_[0] != 19 && $info->{gametype} == GAMETYPE_RATED;
936 },
807 ); 937 );
808 938
809 if ($self->{channel}) { 939 if ($self->{channel}) {
810 $inlay->append_text ("\nHandicap: "); 940 $inlay->append_text ("\nHandicap: ");
811 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9); 941 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
896 }); 1026 });
897 } 1027 }
898 } 1028 }
899} 1029}
900 1030
901sub draw_users { 1031sub new_game_challenge {
902 my ($self, $inlay) = @_; 1032 my ($self) = @_;
903 1033
904 for (sort keys %{$self->{users}}) { 1034 my $d = $self->{app}{defaults};
905 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>"); 1035
1036 $self->{challenge}{""} = {
1037 gametype => $d->{gametype},
1038 flags => 0,
1039 notes => $d->{stones},
1040 rules => {
1041 ruleset => $d->{ruleset},
1042 size => $d->{size},
1043 timesys => $d->{timesys},
1044 time => $d->{time},
1045 interval => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_time} : $d->{can_time},
1046 count => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_periods} : $d->{can_stones},
1047 },
1048
1049 inlay => $self->{chat}->new_inlay,
906 } 1050 };
1051 $self->draw_challenge ("");
907} 1052}
908 1053
909sub event_challenge { 1054sub event_challenge {
910 my ($self, $info) = @_; 1055 my ($self, $info) = @_;
911 1056
912 my $as_black = $info->{black}->{name} eq $self->{conn}{name}; 1057 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
913 my $opponent = $as_black ? $info->{white} : $info->{black}; 1058 my $opponent = $as_black ? $info->{white} : $info->{black};
914 1059
915 my $id = $opponent->{name}; 1060 my $id = $opponent->{name};
1061
1062 sound::play 2, "info";
916 1063
917 $self->{challenge}{$id} = $info; 1064 $self->{challenge}{$id} = $info;
918 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay ( 1065 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
919 exists $self->{challenge}{""} 1066 exists $self->{challenge}{""}
920 ? "Challenge from $opponent->{name}" 1067 ? "Challenge from " . $opponent->as_string
921 : "Challenge to $opponent->{name}", 1068 : "Challenge to " . $opponent->as_string,
922 sub { 1069 sub {
923 $self->{challenge}{$id}{inlay} = $_[0]; 1070 $self->{challenge}{$id}{inlay} = $_[0];
924 $self->draw_challenge ($id); 1071 $self->draw_challenge ($id);
925 }, 1072 },
926 !exists $self->{challenge}{""} # only open when not offerer 1073 !exists $self->{challenge}{""} # only open when not offerer

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines