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.82 by pcg, Thu May 20 15:05:49 2004 UTC vs.
Revision 1.110 by root, Mon May 31 17:06:19 2004 UTC

15 Gtk2::Label; 15 Gtk2::Label;
16 16
17sub INIT_INSTANCE { 17sub INIT_INSTANCE {
18 my $self = shift; 18 my $self = shift;
19 19
20 $self->signal_connect (destroy => sub { $_[0]->stop });
21
20 $self->{set} = sub { }; 22 $self->{set} = sub { };
21 $self->{format} = sub { "ERROR" }; 23 $self->{format} = sub { "???" };
22} 24}
23 25
24sub FINALIZE_INSTANCE { 26sub FINALIZE_INSTANCE {
25 my ($self) = @_; 27 my $self = shift;
26 print "finalize(clock)\n";#d# 28
27 $self->stop; 29 $self->stop;
28} 30}
29 31
30sub configure { 32sub configure {
31 my ($self, $timesys, $main, $interval, $count) = @_; 33 my ($self, $timesys, $main, $interval, $count) = @_;
32 34
33 if ($timesys == TIMESYS_ABSOLUTE) { 35 if ($timesys == TIMESYS_ABSOLUTE) {
34 $self->{set} = sub { $self->{time} = $_[0] }; 36 $self->{format} = sub {
35 $self->{format} = sub { util::format_time $_[0] }; 37 if ($_[0] <= 0) {
38 "TIMEOUT";
39 } else {
40 util::format_time $_[0];
41 }
42 };
36 43
37 } elsif ($timesys == TIMESYS_BYO_YOMI) { 44 } elsif ($timesys == TIMESYS_BYO_YOMI) {
38 my $low = $interval * $count; 45 my $low = $interval * $count;
39 46
40 $self->{set} = sub { $self->{time} = $_[0] };
41
42 $self->{format} = sub { 47 $self->{format} = sub {
48 if ($_[0] <= 0) {
49 "TIMEOUT";
43 if ($_[0] > $low) { 50 } elsif ($_[0] > $low) {
44 util::format_time $_[0] - $low; 51 util::format_time $_[0] - $low;
45 } else { 52 } else {
46 sprintf "%s (%d)", 53 sprintf "%s (%d)",
47 util::format_time int (($_[0] - 1) % $interval + 1), 54 util::format_time int (($_[0] - 1) % $interval + 1),
48 ($_[0] - 1) / $interval; 55 ($_[0] - 1) / $interval;
49 } 56 }
50 }; 57 };
51 58
52 } elsif ($timesys == TIMESYS_CANADIAN) { 59 } elsif ($timesys == TIMESYS_CANADIAN) {
53 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
54
55 $self->{format} = sub { 60 $self->{format} = sub {
61 if ($_[0] <= 0) {
62 "TIMEOUT";
56 if (!$self->{moves}) { 63 } elsif (!$self->{moves}) {
57 util::format_time $_[0] - $low; 64 util::format_time $_[0] - $low;
58 } else { 65 } else {
59 my $time = int (($_[0] - 1) % $interval + 1); 66 my $time = int (($_[0] - 1) % $interval + 1);
60 67
61 sprintf "%s/%d =%d", 68 sprintf "%s/%d =%d",
67 } 74 }
68 }; 75 };
69 76
70 } else { 77 } else {
71 # none, or unknown 78 # none, or unknown
72 $self->{set} = sub { };
73 $self->{format} = sub { "---" } 79 $self->{format} = sub { "-" }
74 } 80 }
75} 81}
76 82
77sub refresh { 83sub refresh {
78 my ($self, $timestamp) = @_; 84 my ($self, $timestamp) = @_;
79 my $timer = $self->{time} + $self->{start} - $timestamp; 85 my $timer = $self->{time} + $self->{start} - $timestamp;
80 86
81 # we round the timer value slightly... the protocol isn't exact anyways, 87 # we round the timer value slightly... the protocol isn't exact anyways,
82 # and this gives smoother timers ;) 88 # and this gives smoother timers ;)
83 my @format = $self->{format}->(int ($timer + 0.4)); 89 my $timer2 = int $timer + 0.4;
90
84 $self->set_text ($self->{format}->(int ($timer + 0.4))); 91 $self->set_text ($self->{format}->($timer2));
85 92
86 $timer - int $timer; 93 $timer - int $timer;
87} 94}
88 95
89sub set_time { 96sub set_time {
90 my ($self, $time) = @_; 97 my ($self, $start, $time, $moves) = @_;
91 98
92 # we ignore requests to re-set the time of a running clock. 99 $self->{time} = $time;
93 # this is the easiest way to ensure that commentary etc. 100 $self->{moves} = $moves;
94 # doesn't re-set the clock. yes, this is frickle design, 101
95 # but I think the protocol is to blame here, which gives 102 if ($start) {
96 # very little time information. (cgoban2 also has had quite 103 $self->{start} = $start;
97 # a lot of small time update problems...) 104 $self->start;
98 unless ($self->{timeout}) { 105 } else {
99 $self->{set}->($time->[0], $time->[1]); 106 $self->stop;
100 $self->refresh ($self->{start}); 107 $self->refresh ($self->{start});
101 } 108 }
102} 109}
103 110
104sub start { 111sub start {
105 my ($self, $when) = @_; 112 my ($self) = @_;
106 113
107 $self->stop; 114 $self->stop;
108
109 $self->{start} = $when;
110 115
111 my $timeout; $timeout = sub { 116 my $timeout; $timeout = sub {
112 my $next = $self->refresh (Time::HiRes::time) * 1000; 117 my $next = $self->refresh (Time::HiRes::time) * 1000;
113 $next += 1000 if $next < 0; 118 $next += 1000 if $next < 0;
114 $self->{timeout} = add Glib::Timeout $next, $timeout; 119 $self->{timeout} = add Glib::Timeout $next, $timeout;
171 } 176 }
172 177
173 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); 178 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
174} 179}
175 180
176sub set_state { 181sub set_captures {
177 my ($self, $captures, $timer, $when) = @_; 182 my ($self, $captures) = @_;
178
179 $self->{clock}->stop unless $when;
180 $self->{clock}->set_time ($timer);
181 $self->{clock}->start ($when) if $when;
182 183
183 $self->{info}->set_text ("$captures pris."); 184 $self->{info}->set_text ("$captures pris.");
184} 185}
185 186
187sub set_timer {
188 my ($self, $start, $time, $moves) = @_;
189
190 $self->{clock}->set_time ($start, $time, $moves);
191}
192
186package game; 193package game;
194
195use Scalar::Util qw(weaken);
187 196
188use KGS::Constants; 197use KGS::Constants;
189use KGS::Game::Board; 198use KGS::Game::Board;
190 199
191use Gtk2::GoBoard; 200use Gtk2::GoBoard;
201use Gtk2::GoBoard::Constants;
192 202
203use base KGS::Game;
193use base KGS::Listener::Game; 204use base KGS::Listener::Game;
194use base KGS::Game;
195 205
196use base gtk::widget; 206use Glib::Object::Subclass
207 Gtk2::Window;
197 208
198use POSIX qw(ceil); 209use POSIX qw(ceil);
199 210
200sub new { 211sub new {
201 my $self = shift; 212 my ($self, %arg) = @_;
202 $self = $self->SUPER::new(@_); 213 $self = $self->Glib::Object::new;
214 $self->{$_} = delete $arg{$_} for keys %arg;
203 215
204 $self->listen($self->{conn});
205
206 $self->{window} = new Gtk2::Window 'toplevel';
207 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 216 gtk::state $self, "game::window", undef, window_size => [600, 500];
208 217
209 $self->{window}->signal_connect(delete_event => sub { 218 $self->signal_connect (destroy => sub {
210 $self->part; 219 $self->unlisten;
211 $self->destroy; 220 delete $self->{app}{game}{$self->{channel}};
212 1; 221 %{$_[0]} = ();
213 }); 222 });#d#
214 223
215 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 224 $self->add (my $hpane = new Gtk2::HPaned);
216 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 225 gtk::state $hpane, "game::hpane", undef, position => 500;
217 226
218 # LEFT PANE 227 # LEFT PANE
219 228
220 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 229 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
221 230
222 $self->{boardbox} = new Gtk2::VBox; 231 $self->{boardbox} = new Gtk2::VBox;
223 232
224 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 233 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
225 234
226 # challenge
227
228 $self->{challenge} = new challenge channel => $self->{channel};
229
230 # board box (aspect/canvas) 235 # board box (aspect/canvas)
231 236
232 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 237 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
238
239 # RIGHT PANE
240
241 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
242 $hpane->set (position_set => 1);
243
244 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
233 245
234 { 246 {
235 $frame->add (my $vbox = new Gtk2::VBox); 247 $frame->add (my $vbox = new Gtk2::VBox);
236 $vbox->add ($self->{title} = new Gtk2::Label $title); 248 $vbox->add ($self->{title} = new Gtk2::Label $title);
237 249
243 255
244 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); 256 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
245 $scale->set_draw_value (0); 257 $scale->set_draw_value (0);
246 $scale->set_digits (0); 258 $scale->set_digits (0);
247 259
248 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 260 $self->{moveadj}->signal_connect (value_changed => sub {
261 $self->{showmove} = int $self->{moveadj}->get_value;
262 $self->update_board;
263 });
249 } 264 }
250 265
251 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
252
253 # RIGHT PANE
254
255 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
256 $self->{hpane}->set(position_set => 1);
257 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
258
259 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
260 $sw->set_policy("automatic", "always");
261
262 $sw->add(($self->{userlist} = new userlist)->widget);
263
264 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
265
266 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 266 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
267 267
268 for (COLOUR_WHITE, COLOUR_BLACK) {
269 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_); 268 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
270 Scalar::Util::weaken $self->{userpanel}[$_]; 269 for COLOUR_WHITE, COLOUR_BLACK;
270
271 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
272
273 $buttonbox->add ($self->{button_pass} =
274 Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0));
275 $self->{button_pass}->signal_connect (clicked => sub {
276 $self->{board_click}->(255, 255) if $self->{board_click};
271 } 277 });
278 $buttonbox->add ($self->{button_undo} =
279 Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0));
280 $self->{button_undo}->signal_connect (clicked => sub {
281 $self->send (req_undo => channel => $self->{channel});
282 });
283 $buttonbox->add ($self->{button_resign} =
284 Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0));
285 $self->{button_resign}->signal_connect (clicked => sub {
286 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
287 });
272 288
273 $vbox->pack_start(($self->{chat} = new chat), 1, 1, 0); 289 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
274 290
275 $self->{chat}->signal_connect(command => sub { 291 $self->set_channel ($self->{channel});
276 my ($chat, $cmd, $arg) = @_;
277 if ($cmd eq "rsave") {
278 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
279 } else {
280 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
281 }
282 });
283 292
284 $self->event_update_game; 293 $self->show_all;
294
285 $self; 295 $self;
296}
297
298sub set_channel {
299 my ($self, $channel) = @_;
300
301 $self->{channel} = $channel;
302
303 if ($self->{channel} > 0) {
304 $self->listen ($self->{conn});
305
306 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
307 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
308
309 $self->signal_connect (delete_event => sub { $self->part; 1 });
310 $self->{chat}->signal_connect (command => sub {
311 my ($chat, $cmd, $arg) = @_;
312 if ($cmd eq "rsave") {
313 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
314 } else {
315 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
316 }
317 });
318 }
286} 319}
287 320
288sub event_update_users { 321sub event_update_users {
289 my ($self, $add, $update, $remove) = @_; 322 my ($self, $add, $update, $remove) = @_;
290 323
291 return unless $self->{userlist};
292
293 $self->{userlist}->update ($add, $update, $remove); 324# $self->{userlist}->update ($add, $update, $remove);
325
326 $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
327 for @$remove;
328
329 $self->{users_inlay}->refresh;
294 330
295 my %important; 331 my %important;
332 $important{$self->{black}{name}}++;
333 $important{$self->{white}{name}}++;
296 $important{$self->{user1}{name}}++; 334 $important{$self->{owner}{name}}++;
297 $important{$self->{user2}{name}}++;
298 $important{$self->{user3}{name}}++;
299 335
300 if (my @users = grep $important{$_->{name}}, @$add) { 336 if (my @users = grep $important{$_->{name}}, @$add) {
301 $self->{chat}->append_text ("\n<header>Joins:</header>"); 337 $self->{chat}->append_text ("\n<header>Joins:</header>");
302 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 338 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
303 } 339 }
304 if (my @users = grep $important{$_->{name}}, @$remove) { 340 if (my @users = grep $important{$_->{name}}, @$remove) {
305 $self->{chat}->append_text ("\n<header>Parts:</header>"); 341 $self->{chat}->append_text ("\n<header>Parts:</header>");
306 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 342 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
307 } 343 }
308
309} 344}
310 345
311sub join { 346sub join {
312 my ($self) = @_; 347 my ($self) = @_;
313 return if $self->{joined}; 348 return if $self->{joined};
314 349
315 $self->SUPER::join; 350 $self->SUPER::join;
316
317 $self->{window}->show_all;
318} 351}
319 352
320sub part { 353sub update_cursor {
354 my ($self) = @_;
355
356 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
357
358 delete $self->{board_click};
359
360 if ($self->{teacher} eq $self->{app}{conn}) {
361 #TODO# # teaching mode not implemented
362 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
363 $self->{button_undo}->hide;
364 $self->{button_resign}->hide;
365 $self->{board}->set (cursor => undef);
366
367 } elsif ($running && $self->{colour} != COLOUR_NONE) {
368 # during game
369 $self->{button_undo}->show;
370 $self->{button_resign}->show;
371
372 if ($self->{cur_board}{score}) {
373 # during scoring
374 $self->{button_pass}->set (label => "Done", visible => 1, sensitive => 1);
375 $self->{board}->set (cursor => sub {
376 $_[0] & (MARK_B | MARK_W)
377 ? $_[0] ^ MARK_GRAYED
378 : $_[0];
379 });
380 $self->{board_click} = sub {
381 if ($_[0] == 255) {
382 $self->{button_pass}->sensitive (0);
383 $self->done;
384 } else {
385 $self->send (mark_dead =>
386 channel => $self->{channel},
387 x => $_[0],
388 y => $_[1],
389 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
390 );
391 }
392 };
393
394 } elsif ($self->{colour} == $self->{whosemove}) {
395 # normal move
396 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
397 $self->{board}->set (cursor => sub {
398 # if is_valid_move oder so#TODO#
399 $_[0] & (MARK_B | MARK_W)
400 ? $_[0]
401 : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B);
402 });
403 $self->{board_click} = sub {
404 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
405 $self->{board}->set (cursor => undef);
406 delete $self->{board_click};
407 $self->{button_pass}->sensitive (0);
408 };
409 } else {
410 $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
411 $self->{board}->set (cursor => undef);
412 }
413 } else {
414 $self->{button_undo}->hide;
415 $self->{button_resign}->hide;
416 $self->{button_pass}->hide;
417 $self->{board}->set (cursor => undef);
418 #TODO# # implement coordinate-grabbing
419 }
420}
421
422sub update_timers {
321 my ($self) = @_; 423 my ($self, $timers) = @_;
322 424
323 $self->SUPER::part; 425 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
324 $self->destroy; 426
427 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
428 my $t = $timers->[$colour];
429 $self->{userpanel}[$colour]->set_timer (
430 $running && $colour == $self->{whosemove} && $t->[0],
431 $t->[1] || $self->{rules}{time}
432 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
433 && $self->{rules}{interval} * $self->{rules}{count}),
434 $t->[2] || $self->{rules}{count});
435 }
325} 436}
326 437
327sub update_board { 438sub update_board {
328 my ($self) = @_; 439 my ($self) = @_;
329 return unless $self->{path}; 440 return unless $self->{path};
330 441
331 my $move = int $self->{moveadj}->get_value;
332
333 my $running = $move == @{$self->{path}};
334
335 $self->{board_label}->set_text ("Move " . ($move - 1)); 442 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
336 443
337 $self->{cur_board} = new KGS::Game::Board $self->{size}; 444 $self->{cur_board} = new KGS::Game::Board $self->{size};
338 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 445 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
339 446
447 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
340 for my $colour (COLOUR_WHITE, COLOUR_BLACK) { 448 for COLOUR_WHITE, COLOUR_BLACK;
341 $self->{userpanel}[$colour]->set_state ( 449
342 $self->{cur_board}{captures}[$colour], 450 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
451 if ($self->{curnode}{move} == 0) {
452 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
453 } else {
454 $self->{whosemove} = 1 - $self->{cur_board}{last};
455 }
456 } else {
457 # Chinese, Aga, NZ all have manual placement
458 if ($self->{curnode}{move} < $self->{handicap}) {
459 $self->{whosemove} = COLOUR_BLACK;
460 } elsif ($self->{curnode}{move} == $self->{handicap}) {
461 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
462 } else {
463 $self->{whosemove} = 1 - $self->{cur_board}{last};
464 }
465 }
466
467 my $start_time = $self->{rules}{time};
468
469 if ($self->{showmove} == @{$self->{path}}) {
470 $self->{timers} = [
471 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
472 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
473 ];
474 $self->update_timers ($self->{timers});
475 } else {
476 $self->update_timers ([
343 $self->{cur_board}{timer}[$colour], 477 [0, @{$self->{cur_board}{timer}[0]}],
344 ($running && $self->{lastmove_colour} == !$colour) 478 [0, @{$self->{cur_board}{timer}[1]}],
345 ? $self->{lastmove_time} : 0
346 ); 479 ]);
347 } 480 }
348 481
349 $self->{board}->set_board ($self->{cur_board}); 482 $self->{board}->set_board ($self->{cur_board});
483
484 if ($self->{cur_board}{score}) {
485 $self->{score_inlay} ||= $self->{chat}->new_inlay;
486 $self->{score_inlay}->clear;
487 $self->{score_inlay}->append_text ("\n<header>Scoring</header>"
488 . "\n<score>"
489 . "White: $self->{cur_board}{score}[COLOUR_WHITE], "
490 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
491 . "</score>");
492 } elsif ($self->{score_inlay}) {
493 (delete $self->{score_inlay})->clear;
494 }
495
496 $self->update_cursor;
350} 497}
351 498
352sub event_update_tree { 499sub event_update_tree {
353 my ($self) = @_; 500 my ($self) = @_;
501
502 (delete $self->{undo_inlay})->clear
503 if $self->{undo_inlay};
354 504
355 $self->{path} = $self->get_path; 505 $self->{path} = $self->get_path;
356 506
357 if ($self->{moveadj}) { 507 if ($self->{moveadj}) {
358 my $upper = $self->{moveadj}->upper; 508 my $upper = $self->{moveadj}->upper;
406 $self->{chat}->append_text ($text); 556 $self->{chat}->append_text ($text);
407} 557}
408 558
409sub event_join { 559sub event_join {
410 my ($self) = @_; 560 my ($self) = @_;
561
411 $self->SUPER::event_join; 562 $self->SUPER::event_join (@_);
563 $self->init_tree;
564 $self->event_update_game;
412} 565}
413 566
414sub event_part { 567sub event_part {
415 my ($self) = @_; 568 my ($self) = @_;
569
416 $self->SUPER::event_part; 570 $self->SUPER::event_part;
417 $self->destroy; 571 $self->destroy;
418} 572}
419 573
420sub event_move { 574sub event_move {
421 my ($self, $pass) = @_; 575 my ($self, $pass) = @_;
576
422 sound::play 1, $pass ? "pass" : "move"; 577 sound::play 1, $pass ? "pass" : "move";
423} 578}
424 579
425sub event_update_game { 580sub event_update_game {
426 my ($self) = @_; 581 my ($self) = @_;
582
427 $self->SUPER::event_update_game; 583 $self->SUPER::event_update_game;
428 584
429 return unless $self->{window}; 585 return unless $self->{joined};
430 586
587 $self->{colour} = $self->player_colour ($self->{conn}{name});
588
431 my $title = defined $self->{channel} 589 my $title = defined $self->{channel}
432 ? $self->owner->as_string . " " . $self->opponent_string 590 ? $self->owner->as_string . " " . $self->opponent_string
433 : "Game Window"; 591 : "Game Window";
434 $self->{window}->set_title("KGS Game $title"); 592 $self->set_title ("KGS Game $title");
435 $self->{title}->set_text ($title); 593 $self->{title}->set_text ($title);
436 594
437 $self->{user}[COLOUR_BLACK] = $self->{user1}; 595 $self->{user}[COLOUR_BLACK] = $self->{black};
438 $self->{user}[COLOUR_WHITE] = $self->{user2}; 596 $self->{user}[COLOUR_WHITE] = $self->{white};
439 597
440 # show board 598 # show board
599 if ($self->is_inprogress) {
600 if (!$self->{boardbox}->parent) {
601 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
602 $self->{left}->add ($self->{boardbox});
603 $self->{board}->signal_connect (button_release => sub {
604 if ($_[1] == 1) {
605 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
606 }
607 });
608 }
609 if (my $ch = delete $self->{challenge}) {
610 $_->{inlay}->destroy for values %$ch;
611 }
612 $self->update_cursor;
613 }
614
615 $self->{left}->show_all;
616
617 $self->{rules_inlay}->refresh;
441 618
619}
620
621sub draw_setup {
622 my ($self, $inlay) = @_;
623
624 return unless $self->{joined};
625
626 my $rules = $self->{rules};
627
628 my $text = "";
629
630 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
631 if $self->{teacher};
632
633 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
634 if $self->{owner}->is_valid;
635
442 if ($self->is_inprogress) { 636 if ($self->is_inprogress) {
443 $self->{left}->remove ($self->{challenge}->widget) if $self->{challenge} && $self->{boardbox}->parent;
444 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
445 } else {
446 $self->{left}->remove ($self->{boardbox}) if $self->{boardbox}->parent;
447 $self->{left}->add ($self->{challenge}->widget) unless $self->{challenge}->widget->parent;
448 }
449 $self->{left}->show_all;
450
451 # view text
452
453 eval { #d#
454 my @ga;
455 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
456 . " (" . (util::toxml $gameopt{$self->option}) . ")";
457 $ga[1] = "\nFlags:";
458 $ga[1] .= " started" if $self->is_inprogress;
459 $ga[1] .= " adjourned" if $self->is_adjourned;
460 $ga[1] .= " scored" if $self->is_scored;
461 $ga[1] .= " saved" if $self->is_saved;
462
463 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
464 if $self->{user3}->is_inprogress;
465
466 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 637 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
467 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 638 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
468 if $self->is_inprogress;
469
470 if ($self->is_inprogress) {
471 $ga[4] = "\nHandicap: " . $self->{handicap};
472 $ga[5] = "\nKomi: " . $self->{komi};
473 $ga[6] = "\nSize: " . $self->size_string;
474 }
475
476 if ($self->is_scored) {
477 $ga[7] = "\nResult: " . $self->score_string;
478 }
479
480 $text = "\n<infoblock><header>Game Update</header>";
481 for (0..7) {
482 if ($self->{gatext}[$_] ne $ga[$_]) {
483 $text .= $ga[$_];
484 }
485 }
486 $text .= "</infoblock>";
487
488 $self->{gatext} = \@ga;
489 }; 639 }
490 640 $text .= "\nType: " . util::toxml $gametype{$self->type};
491 $self->{chat}->append_text ($text);
492}
493
494sub event_update_rules {
495 my ($self, $rules) = @_;
496
497 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
498 for COLOUR_BLACK, COLOUR_WHITE;
499
500 sound::play 3, "gamestart";
501
502 my $text = "\n<header>Game Rules</header>";
503 641
504 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 642 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
505 643
506 $text .= "\nTime: "; 644 $text .= "\nTime: ";
507 645
516 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 654 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
517 $text .= util::format_time $rules->{time}; 655 $text .= util::format_time $rules->{time};
518 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 656 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
519 } 657 }
520 658
659 $text .= "\nFlags:";
660 $text .= " private" if $self->is_private;
661 $text .= " started" if $self->is_inprogress;
662 $text .= " adjourned" if $self->is_adjourned;
663 $text .= " scored" if $self->is_scored;
664 $text .= " saved" if $self->is_saved;
665
666 if ($self->is_inprogress) {
667 $text .= "\nHandicap: " . $self->{handicap};
668 $text .= "\nKomi: " . $self->{komi};
669 $text .= "\nSize: " . $self->size_string;
670 }
671
672 if ($self->is_scored) {
673 $text .= "\nResult: " . $self->score_string;
674 }
675
521 $self->{chat}->append_text ("<infoblock>$text</infoblock>"); 676 $inlay->append_text ("<infoblock>$text</infoblock>");
522}
523 677
524sub inject_resign_game { 678}
679
680sub event_update_rules {
525 my ($self, $msg) = @_; 681 my ($self, $rules) = @_;
682
683 $self->{rules} = $rules;
684
685 if ($self->{user}) {
686 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
687 for COLOUR_BLACK, COLOUR_WHITE;
688 }
689
690 sound::play 3, "gamestart";
691 $self->{rules_inlay}->refresh;
692}
693
694sub event_resign_game {
695 my ($self, $player) = @_;
526 696
527 sound::play 3, "resign"; 697 sound::play 3, "resign";
528
529 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 698 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
530 . "\n<user>" 699 . "\n<user>"
531 . (util::toxml $self->{user}[$msg->{player}]->as_string) 700 . (util::toxml $self->{user}[$msg->{player}]->as_string)
532 . "</user> resigned.</infoblock>"); 701 . "</user> resigned.</infoblock>");
702}
703
704sub event_out_of_time {
705 my ($self, $player) = @_;
706
707 sound::play 3, "timewin";
708 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
709 . "\n<user>"
710 . (util::toxml $self->{user}[$msg->{player}]->as_string)
711 . "</user> ran out of time and lost.</infoblock>");
712}
713
714sub event_done {
715 my ($self) = @_;
716
717 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
718 sound::play 2, "info" unless $inlay->{count};
719 $self->{chat}->append_text ("\n<infoblock><header>Press Done</header>"
720 . "\nYour opponent pressed done. Now it's up to you.");
721 }
722 if ($self->{doneid} & 0x80000000) {
723 sound::play 2, "info" unless $inlay->{count};
724 $self->{chat}->append_text ("\n<infoblock><header>Press Done Again</header>"
725 . "\nThe board has changed.");
726 }
727
728 $self->{button_pass}->sensitive (!$self->{done}[$self->{colour}]);
729
730 $self->{chat}->set_end;
533} 731}
534 732
535sub inject_final_result { 733sub inject_final_result {
536 my ($self, $msg) = @_; 734 my ($self, $msg) = @_;
537 735
540 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 738 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
541 . "</infoblock>" 739 . "</infoblock>"
542 ); 740 );
543} 741}
544 742
743sub inject_set_gametime {
744 my ($self, $msg) = @_;
745
746 $self->{timers} = [
747 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
748 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
749 ];
750
751 $self->update_timers ($self->{timers})
752 if $self->{showmove} == @{$self->{path}};
753}
754
755sub inject_req_undo {
756 my ($self, $msg) = @_;
757
758 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
759 return if $inlay->{ignore};
760
761 sound::play 2, "warning" unless $inlay->{count};
762 $inlay->{count}++;
763
764 $inlay->clear;
765 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
766 $inlay->append_button ("Grant", sub {
767 (delete $self->{undo_inlay})->clear;
768 $self->send (grant_undo => channel => $self->{channel});
769 });
770 $inlay->append_button ("Ignore", sub {
771 $inlay->clear;
772 $inlay->{ignore} = 1;
773 # but leave inlay, so further undo requests get counted
774 });
775
776 $self->{chat}->set_end;
777}
778
779sub inject_new_game {
780 my ($self, $msg) = @_;
781
782 if ($msg->{cid} != $self->{cid}) {
783 $self->part;
784 warn "ERROR: challenge id mismatch, PLEASE REPORT, especially the circumstances (many games open? etc..)\n";#d#
785 }
786
787 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
788 delete $self->{cid};
789}
790
791sub draw_challenge {
792 my ($self, $id) = @_;
793
794 my $info = $self->{challenge}{$id};
795 my $inlay = $info->{inlay};
796 my $rules = $info->{rules};
797
798 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
799 my $opponent = $as_black ? $info->{white} : $info->{black};
800
801 my ($size, $time, $interval, $count, $type);
802
803 if (!$self->{channel}) {
804 $inlay->append_text ("\nNotes: ");
805 $inlay->append_entry (\$info->{notes}, 20, "");
806 $inlay->append_text ("\nGlobal Offer: ");
807 $inlay->append_optionmenu (\$info->{flags},
808 0 => "No",
809 2 => "Yes",
810 );
811 } else {
812 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
813 }
814
815 $inlay->append_text ("\nType: ");
816 $type = $inlay->append_optionmenu (
817 \$info->{gametype},
818 GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
819 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
820 GAMETYPE_TEACHING , "Teaching (not yet)",
821 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
822 GAMETYPE_SIMUL , "Simul (not yet!)",
823 GAMETYPE_FREE , "Free",
824 GAMETYPE_RATED , "Rated",
825 sub {
826 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
827 },
828 );
829
830 if ($self->{channel}) {
831 $inlay->append_text ("\nMy Colour: ");
832 $inlay->append_optionmenu (
833 \$as_black,
834 0 => "White",
835 1 => "Black",
836 sub {
837 if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
838 ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
839 }
840 }
841 );
842 }
843
844 $inlay->append_text ("\nRuleset: ");
845 $inlay->append_optionmenu (
846 \$info->{rules}{ruleset},
847 RULESET_JAPANESE , "Japanese",
848 RULESET_CHINESE , "Chinese",
849 RULESET_AGA , "AGA",
850 RULESET_NEW_ZEALAND, "New Zealand",
851 );
852
853 $inlay->append_text ("\nSize: ");
854 $size = $inlay->append_optionmenu (
855 \$info->{rules}{size},
856 (9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38),
857 sub {
858 $type->set_history (5) # reset to free
859 if $_[0] != 19 && $info->{gametype} == GAMETYPE_RATED;
860 },
861 );
862
863 if ($self->{channel}) {
864 $inlay->append_text ("\nHandicap: ");
865 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
866
867 $inlay->append_text ("\nKomi: ");
868 $inlay->append_entry (\$info->{rules}{komi}, 5);
869 }
870
871 $inlay->append_text ("\nTimesys: ");
872 $inlay->append_optionmenu (
873 \$info->{rules}{timesys},
874 &TIMESYS_NONE => "None",
875 &TIMESYS_ABSOLUTE => "Absolute",
876 &TIMESYS_BYO_YOMI => "Byo Yomi",
877 &TIMESYS_CANADIAN => "Canadian",
878 sub {
879 my ($new) = @_;
880
881 if ($new eq TIMESYS_NONE) {
882 $time->hide;
883 $interval->hide;
884 $count->hide;
885 } else {
886 $time->show;
887 $time->set_text ($self->{app}{defaults}{time});
888 if ($new eq TIMESYS_ABSOLUTE) {
889 $interval->hide;
890 $count->hide;
891 } else {
892 $interval->show;
893 $count->show;
894 if ($new eq TIMESYS_BYO_YOMI) {
895 $interval->set_text ($self->{app}{defaults}{byo_time});
896 $count->set_text ($self->{app}{defaults}{byo_period});
897 } elsif ($new eq TIMESYS_CANADIAN) {
898 $interval->set_text ($self->{app}{defaults}{can_time});
899 $count->set_text ($self->{app}{defaults}{can_period});
900 }
901 }
902 }
903 }
904 );
905
906 $inlay->append_text ("\nMain Time: ");
907 $time = $inlay->append_entry (\$info->{rules}{time}, 5);
908 $inlay->append_text ("\nInterval: ");
909 $interval = $inlay->append_entry (\$info->{rules}{interval}, 3);
910 $inlay->append_text ("\nPeriods/Stones: ");
911 $count = $inlay->append_entry (\$info->{rules}{count}, 2);
912
913 $inlay->append_text ("\n");
914
915 if (!$self->{channel}) {
916 $inlay->append_button ("Create Challenge", sub {
917 $inlay->clear;
918 $self->{cid} = $self->{conn}->alloc_clientid;
919 $self->send (new_game =>
920 channel => delete $self->{roomid},
921 gametype => $info->{gametype},
922 cid => $self->{cid},
923 flags => $info->{flags},
924 rules => $info->{rules},
925 notes => $info->{notes},
926 );
927 });
928 } else {
929 $inlay->append_button ("OK", sub {
930 $inlay->clear;
931 $self->send (challenge =>
932 channel => $self->{channel},
933 black => $info->{black},
934 white => $info->{white},
935 gametype => $info->{gametype},
936 cid => $info->{cid},
937 rules => $info->{rules},
938 );
939 });
940 if (exists $self->{challenge}{""}) {
941 $inlay->append_button ("Reject", sub {
942 $inlay->clear;
943 $self->send (reject_challenge =>
944 channel => $self->{channel},
945 name => $opponent->{name},
946 gametype => $info->{gametype},
947 cid => $info->{cid},
948 rules => $info->{rules},
949 );
950 });
951 }
952 }
953}
954
955sub draw_users {
956 my ($self, $inlay) = @_;
957
958 for (sort keys %{$self->{users}}) {
959 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
960 }
961}
962
545sub event_challenge { 963sub event_challenge {
546 my ($self, $challenge) = @_;
547
548 use KGS::Listener::Debug;
549 $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
550}
551
552sub destroy {
553 my ($self) = @_; 964 my ($self, $info) = @_;
554 965
555 delete $self->{app}{gamelist}{game}{$self->{channel}}; 966 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
556 $self->SUPER::destroy; 967 my $opponent = $as_black ? $info->{white} : $info->{black};
968
969 my $id = $opponent->{name};
970
971 sound::play 2, "info";
972
973 $self->{challenge}{$id} = $info;
974 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
975 exists $self->{challenge}{""}
976 ? "Challenge from " . $opponent->as_string
977 : "Challenge to " . $opponent->as_string,
978 sub {
979 $self->{challenge}{$id}{inlay} = $_[0];
980 $self->draw_challenge ($id);
981 },
982 !exists $self->{challenge}{""} # only open when not offerer
983 );
557} 984}
558 985
5591; 9861;
560 987

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines