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.101 by pcg, Sun May 30 05:04:09 2004 UTC vs.
Revision 1.117 by root, Tue Jun 1 21:24:11 2004 UTC

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

Diff Legend

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