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.98 by pcg, Sun May 30 02:22:24 2004 UTC vs.
Revision 1.121 by root, Wed Jun 2 04:39:07 2004 UTC

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

Diff Legend

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