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.69 by pcg, Tue Jul 22 21:24:50 2003 UTC vs.
Revision 1.99 by pcg, Sun May 30 03:03:38 2004 UTC

1use utf8; 1use utf8;
2
3use Scalar::Util ();
2 4
3package game::goclock; 5package game::goclock;
4 6
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock 7# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked. 8# is completely borked.
7 9
8use Time::HiRes (); 10use Time::HiRes ();
9 11
10use KGS::Constants; 12use KGS::Constants;
11 13
12use base gtk::widget; 14use Glib::Object::Subclass
15 Gtk2::Label;
13 16
14sub new { 17sub INIT_INSTANCE {
15 my $class = shift; 18 my $self = shift;
16 my $self = $class->SUPER::new(@_);
17 19
18 $self->{widget} = new Gtk2::Label; 20 $self->signal_connect (destroy => sub { $_[0]->stop });
19 21
20 $self->{set} = sub { }; 22 $self->{set} = sub { };
21 $self->{format} = sub { "ERROR" }; 23 $self->{format} = sub { "???" };
22
23 $self;
24} 24}
25 25
26sub configure { 26sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_; 27 my ($self, $timesys, $main, $interval, $count) = @_;
28 28
55 my $time = int (($_[0] - 1) % $interval + 1); 55 my $time = int (($_[0] - 1) % $interval + 1);
56 56
57 sprintf "%s/%d =%d", 57 sprintf "%s/%d =%d",
58 util::format_time $time, 58 util::format_time $time,
59 $self->{moves}, 59 $self->{moves},
60 $self->{moves} > 1
60 $time / ($self->{moves} || 1); 61 ? $time / $self->{moves}
61 62 : $interval;
62 } 63 }
63 }; 64 };
64 65
65 } else { 66 } else {
66 # none, or unknown 67 # none, or unknown
74 my $timer = $self->{time} + $self->{start} - $timestamp; 75 my $timer = $self->{time} + $self->{start} - $timestamp;
75 76
76 # we round the timer value slightly... the protocol isn't exact anyways, 77 # we round the timer value slightly... the protocol isn't exact anyways,
77 # and this gives smoother timers ;) 78 # and this gives smoother timers ;)
78 my @format = $self->{format}->(int ($timer + 0.4)); 79 my @format = $self->{format}->(int ($timer + 0.4));
79 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); 80 $self->set_text ($self->{format}->(int ($timer + 0.4)));
80 81
81 $timer - int $timer; 82 $timer - int $timer;
82} 83}
83 84
84sub set_time { 85sub set_time {
117 my ($self) = @_; 118 my ($self) = @_;
118 119
119 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 120 remove Glib::Source delete $self->{timeout} if $self->{timeout};
120} 121}
121 122
122sub destroy { 123package game::userpanel;
124
125use Glib::Object::Subclass
126 Gtk2::HBox,
127 properties => [
128 Glib::ParamSpec->IV ("colour", "colour", "User Colour", 0, 1, 0, [qw(construct-only writable)]),
129 ];
130
131sub INIT_INSTANCE {
123 my ($self) = @_; 132 my ($self) = @_;
124 $self->stop;
125 $self->SUPER::destroy;
126}
127 133
128package game::userpanel;
129
130use base gtk::widget;
131
132sub new {
133 my $class = shift;
134 my $self = $class->SUPER::new(@_);
135
136 $self->{widget} = new Gtk2::HBox;
137
138 $self->{widget}->add (my $vbox = new Gtk2::VBox); 134 $self->add (my $vbox = new Gtk2::VBox);
139 135
140 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 136 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
141 $vbox->add ($self->{info} = new Gtk2::Label ""); 137 $vbox->add ($self->{info} = new Gtk2::Label "");
142 $vbox->add (($self->{clock} = new game::goclock)->widget); 138 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock};
143 139
144 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 140 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
145 141
146 $self; 142 $self;
147} 143}
183 $self->{info}->set_text ("$captures pris."); 179 $self->{info}->set_text ("$captures pris.");
184} 180}
185 181
186package game; 182package game;
187 183
184use Scalar::Util qw(weaken);
185
188use KGS::Constants; 186use KGS::Constants;
189use KGS::Game::Board; 187use KGS::Game::Board;
190 188
189use Gtk2::GoBoard;
190use Gtk2::GoBoard::Constants;
191
192use Glib::Object::Subclass
193 Gtk2::Window;
194
191use base KGS::Listener::Game; 195use base KGS::Listener::Game;
192use base KGS::Game; 196use base KGS::Game;
193 197
194use base gtk::widget;
195
196use POSIX qw(ceil); 198use POSIX qw(ceil);
197 199
198sub new { 200sub new {
199 my $self = shift; 201 my ($self, %arg) = @_;
200 $self = $self->SUPER::new(@_); 202 $self = $self->Glib::Object::new;
203 $self->{$_} = delete $arg{$_} for keys %arg;
201 204
202 $self->listen($self->{conn});
203
204 $self->{window} = new Gtk2::Window 'toplevel';
205 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 205 gtk::state $self, "game::window", undef, window_size => [600, 500];
206 206
207 $self->{window}->signal_connect(delete_event => sub { 207 $self->signal_connect (destroy => sub {
208 $self->part; 208 $self->unlisten;
209 $self->destroy; 209 delete $self->{app}{game}{$self->{channel}};
210 1; 210 %{$_[0]} = ();
211 }); 211 });#d#
212 212
213 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 213 $self->add (my $hpane = new Gtk2::HPaned);
214 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 214 gtk::state $hpane, "game::hpane", undef, position => 500;
215 215
216 # LEFT PANE 216 # LEFT PANE
217 217
218 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 218 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
219 219
220 $self->{boardbox} = new Gtk2::VBox; 220 $self->{boardbox} = new Gtk2::VBox;
221 221
222 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 222 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
223 223
224 # challenge
225
226 $self->{challenge} = new challenge channel => $self->{channel};
227
228 # board box (aspect/canvas) 224 # board box (aspect/canvas)
229 225
230 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 226 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
227
228 # RIGHT PANE
229
230 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
231 $hpane->set (position_set => 1);
232
233 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
231 234
232 { 235 {
233 $frame->add (my $vbox = new Gtk2::VBox); 236 $frame->add (my $vbox = new Gtk2::VBox);
234 $vbox->add ($self->{title} = new Gtk2::Label $title); 237 $vbox->add ($self->{title} = new Gtk2::Label $title);
235 238
244 $scale->set_digits (0); 247 $scale->set_digits (0);
245 248
246 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 249 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
247 } 250 }
248 251
249 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
250
251 # RIGHT PANE
252
253 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
254 $self->{hpane}->set(position_set => 1);
255 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
256
257 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
258 $sw->set_policy("automatic", "always");
259
260 $sw->add(($self->{userlist} = new userlist)->widget);
261
262 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
263
264 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 252 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
253
265 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 254 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
266 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 255 for COLOUR_WHITE, COLOUR_BLACK;
267 256
268 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 257 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
269 258
270 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 259 $self->set_channel ($self->{channel});
271 $self->{entry}->signal_connect(activate => sub {
272 my $text = $self->{entry}->get_text;
273 $self->say($text) if $text =~ /\S/;
274 $self->{entry}->set_text("");
275 });
276 260
277 $self->event_update_game; 261 $self->show_all;
262
278 $self; 263 $self;
264}
265
266sub set_channel {
267 my ($self, $channel) = @_;
268
269 $self->{channel} = $channel;
270
271 if ($self->{channel} > 0) {
272 $self->listen ($self->{conn});
273
274 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
275 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
276
277 $self->signal_connect (delete_event => sub { $self->part; 1 });
278 $self->{chat}->signal_connect (command => sub {
279 my ($chat, $cmd, $arg) = @_;
280 if ($cmd eq "rsave") {
281 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
282 } else {
283 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
284 }
285 });
286 }
279} 287}
280 288
281sub event_update_users { 289sub event_update_users {
282 my ($self, $add, $update, $remove) = @_; 290 my ($self, $add, $update, $remove) = @_;
283 291
284 $self->{userlist}->update ($add, $update, $remove); 292# $self->{userlist}->update ($add, $update, $remove);
293
294 $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
295 for @$remove;
296
297 $self->{users_inlay}->refresh;
285 298
286 my %important; 299 my %important;
300 $important{$self->{black}{name}}++;
301 $important{$self->{white}{name}}++;
287 $important{$self->{user1}{name}}++; 302 $important{$self->{owner}{name}}++;
288 $important{$self->{user2}{name}}++;
289 $important{$self->{user3}{name}}++;
290 303
291 if (my @users = grep $important{$_->{name}}, @$add) { 304 if (my @users = grep $important{$_->{name}}, @$add) {
292 $self->{text}->append_text ("\n<header>Joins:</header>"); 305 $self->{chat}->append_text ("\n<header>Joins:</header>");
293 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 306 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
294 } 307 }
295 if (my @users = grep $important{$_->{name}}, @$remove) { 308 if (my @users = grep $important{$_->{name}}, @$remove) {
296 $self->{text}->append_text ("\n<header>Parts:</header>"); 309 $self->{chat}->append_text ("\n<header>Parts:</header>");
297 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 310 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
298 } 311 }
299
300} 312}
301 313
302sub join { 314sub join {
303 my ($self) = @_; 315 my ($self) = @_;
304 return if $self->{joined}; 316 return if $self->{joined};
305 317
306 $self->SUPER::join; 318 $self->SUPER::join;
307
308 $self->{window}->show_all;
309} 319}
310 320
311sub part { 321sub update_cursor {
312 my ($self) = @_; 322 my ($self) = @_;
313 323
314 $self->SUPER::part; 324 my $move = int $self->{moveadj}->get_value;
315 $self->destroy; 325 my $cb;
326
327 warn sprintf "move %d spath %d\n", $move, scalar @{$self->{path}};#d#
328 warn "isact " . $self->is_active;#d#
329 warn "flags $self->{flags}\n";#d#
330 warn "handi $self->{handicap}\n";#d#
331
332 my $running = $move == @{$self->{path}}; # && $self->is_active;
333
334 delete $self->{board_click};
335
336 warn "plaiyng $self->{playing} running $running last $self->{cur_board}{last}\n";#d#
337 if ($self->{teacher} eq $self->{app}{conn}) {
338 #TODO# # teaching mode not implemented
339 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
340 } elsif (!$self->{playing} || !$running) {
341 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
342 #TODO# # implement coordinate-grabbing
343 } elsif ($self->{black}{name} eq $self->{conn}{name} && $self->{cur_board}{last} == COLOUR_WHITE) {
344 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_B | MARK_GRAYED);
345 $self->{board_click} = sub {
346 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
347 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
348 delete $self->{board_click};
349 };
350 } elsif ($self->{white}{name} eq $self->{conn}{name} && $self->{cur_board}{last} == COLOUR_BLACK) {
351 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_W | MARK_GRAYED);
352 $self->{board_click} = sub {
353 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
354 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
355 delete $self->{board_click};
356 };
357 }
316} 358}
317 359
318sub update_board { 360sub update_board {
319 my ($self) = @_; 361 my ($self) = @_;
320 return unless $self->{path}; 362 return unless $self->{path};
321 363
322 my $move = int $self->{moveadj}->get_value; 364 my $move = int $self->{moveadj}->get_value;
323 365
324 my $running = $move == @{$self->{path}}; 366 my $running = $move == @{$self->{path}} && !$self->{teacher};
325 367
326 $self->{board_label}->set_text ("Move " . ($move - 1)); 368 $self->{board_label}->set_text ("Move " . ($move - 1));
327 369
328 $self->{cur_board} = new KGS::Game::Board $self->{size}; 370 $self->{cur_board} = new KGS::Game::Board $self->{size};
329 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 371 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
330 372
331 for my $colour (WHITE, BLACK) { 373 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
332 $self->{userpanel}[$colour]->set_state ( 374 $self->{userpanel}[$colour]->set_state (
333 $self->{cur_board}{captures}[$colour], 375 $self->{cur_board}{captures}[$colour],
334 $self->{cur_board}{timer}[$colour], 376 $self->{cur_board}{timer}[$colour],
335 ($running && $self->{lastmove_colour} == !$colour) 377 ($running && $self->{lastmove_colour} == !$colour)
336 ? $self->{lastmove_time} : 0 378 ? $self->{lastmove_time} : 0
337 ); 379 );
338 } 380 }
339 381
340 $self->{board}->set_board ($self->{cur_board}); 382 $self->{board}->set_board ($self->{cur_board});
383
384 $self->update_cursor;
341} 385}
342 386
343sub event_update_tree { 387sub event_update_tree {
344 my ($self) = @_; 388 my ($self) = @_;
345 389
392 }sgexi; 436 }sgexi;
393 437
394 $text .= $_; 438 $text .= $_;
395 } 439 }
396 440
397 $self->{text}->append_text ($text); 441 $self->{chat}->append_text ($text);
398} 442}
399 443
400sub event_join { 444sub event_join {
401 my ($self) = @_; 445 my ($self) = @_;
446
402 $self->SUPER::event_join; 447 $self->SUPER::event_join (@_);
448 $self->init_tree;
449 $self->event_update_game;
403} 450}
404 451
405sub event_part { 452sub event_part {
406 my ($self) = @_; 453 my ($self) = @_;
454
407 $self->SUPER::event_part; 455 $self->SUPER::event_part;
408 $self->destroy; 456 $self->destroy;
409} 457}
410 458
411sub event_move { 459sub event_move {
412 my ($self, $pass) = @_; 460 my ($self, $pass) = @_;
413 sound::play 1, $pass ? "pass" : "move"; 461 sound::play 1, $pass ? "pass" : "move";
462
463 if ($self->{undo_inlay}) {
464 (delete $self->{undo_inlay})->clear;
465 }
414} 466}
415 467
416sub event_update_game { 468sub event_update_game {
417 my ($self) = @_; 469 my ($self) = @_;
470
418 $self->SUPER::event_update_game; 471 $self->SUPER::event_update_game;
419 472
473 return unless $self->{joined};
474
475 $self->{playing} = $self->{teacher} eq $self->{conn}{name}
476 || $self->is_playing ($self->{conn}{name});
477
420 my $title = defined $self->{channel} 478 my $title = defined $self->{channel}
421 ? $self->owner->as_string . " " . $self->opponent_string 479 ? $self->owner->as_string . " " . $self->opponent_string
422 : "Game Window"; 480 : "Game Window";
423 $self->{window}->set_title("KGS Game $title"); 481 $self->set_title("KGS Game $title");
424 $self->{title}->set_text ($title); 482 $self->{title}->set_text ($title);
425 483
426 $self->{user}[BLACK] = $self->{user1}; 484 $self->{user}[COLOUR_BLACK] = $self->{black};
427 $self->{user}[WHITE] = $self->{user2}; 485 $self->{user}[COLOUR_WHITE] = $self->{white};
428 486
429 # show board 487 # show board
488 if ($self->is_inprogress) {
489 if (!$self->{boardbox}->parent) {
490 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
491 $self->{left}->add ($self->{boardbox});
492 $self->{board}->signal_connect (button_release => sub {
493 warn "XXX @_\n";#d#
494 if ($_[1] == 1) {
495 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
496 }
497 });
498 }
499 if (my $ch = delete $self->{challenge}) {
500 $_->{inlay}->destroy for values %$ch;
501 }
502 $self->update_cursor;
503 }
504
505 $self->{left}->show_all;
506
507 $self->{rules_inlay}->refresh;
430 508
431 $self->{left}->remove ($_) for $self->{left}->get_children; 509}
510
511sub draw_setup {
512 my ($self, $inlay) = @_;
513
514 return unless $self->{joined};
515
516 my $rules = $self->{rules};
517
518 my $text = "";
519
520 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
521 if $self->{teacher};
522
523 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
524 if $self->{owner}->is_valid;
525
432 if ($self->is_valid) { 526 if ($self->is_inprogress) {
433 $self->{left}->add ($self->{boardbox});
434 (delete $self->{challenge})->destroy if $self->{challenge};
435 } else {
436 $self->{left}->add ($self->{challenge}->widget);
437 }
438 $self->{left}->show_all;
439
440 # view text
441
442 eval { #d#
443 my @ga;
444 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
445 . " (" . (util::toxml $gameopt{$self->option}) . ")";
446 $ga[1] = "\nFlags:";
447 $ga[1] .= " valid" if $self->is_valid;
448 $ga[1] .= " adjourned" if $self->is_adjourned;
449 $ga[1] .= " scored" if $self->is_scored;
450 $ga[1] .= " saved" if $self->is_saved;
451
452 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
453
454 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 527 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
455 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 528 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
456 if $self->is_valid;
457
458 if ($self->is_valid) {
459 $ga[4] = "\nHandicap: " . $self->{handicap};
460 $ga[5] = "\nKomi: " . $self->{komi};
461 $ga[6] = "\nSize: " . $self->size_string;
462 }
463
464 if ($self->is_scored) {
465 $ga[7] = "\nResult: " . $self->score_string;
466 }
467
468 $text = "\n<infoblock><header>Game Update</header>";
469 for (0..7) {
470 if ($self->{gatext}[$_] ne $ga[$_]) {
471 $text .= $ga[$_];
472 }
473 }
474 $text .= "</infoblock>";
475
476 $self->{gatext} = \@ga;
477 }; 529 }
478 530 $text .= "\nType: " . util::toxml $gametype{$self->type};
479 $self->{text}->append_text ($text);
480}
481
482sub event_update_rules {
483 my ($self, $rules) = @_;
484
485 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
486 for BLACK, WHITE;
487
488 sound::play 3, "gamestart";
489
490 my $text = "\n<header>Game Rules</header>";
491 531
492 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 532 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
493 533
494 $text .= "\nTime: "; 534 $text .= "\nTime: ";
495 535
497 $text .= "UNLIMITED"; 537 $text .= "UNLIMITED";
498 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 538 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
499 $text .= util::format_time $rules->{time}; 539 $text .= util::format_time $rules->{time};
500 $text .= " ABS"; 540 $text .= " ABS";
501 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 541 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
502 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 542 $text .= util::format_time $rules->{time};
503 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; 543 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
504 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 544 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
505 $text .= util::format_time $rules->{time}; 545 $text .= util::format_time $rules->{time};
506 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 546 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
507 } 547 }
508 548
549 $text .= "\nFlags:";
550 $text .= " private" if $self->is_private;
551 $text .= " started" if $self->is_inprogress;
552 $text .= " adjourned" if $self->is_adjourned;
553 $text .= " scored" if $self->is_scored;
554 $text .= " saved" if $self->is_saved;
555
556 if ($self->is_inprogress) {
557 $text .= "\nHandicap: " . $self->{handicap};
558 $text .= "\nKomi: " . $self->{komi};
559 $text .= "\nSize: " . $self->size_string;
560 }
561
562 if ($self->is_scored) {
563 $text .= "\nResult: " . $self->score_string;
564 }
565
509 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 566 $inlay->append_text ("<infoblock>$text</infoblock>");
567
568}
569
570sub event_update_rules {
571 my ($self, $rules) = @_;
572
573 $self->{rules} = $rules;
574
575 if ($self->{user}) {
576 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
577 for COLOUR_BLACK, COLOUR_WHITE;
578 }
579
580 sound::play 3, "gamestart";
581
582 $self->{rules_inlay}->refresh;
510} 583}
511 584
512sub inject_resign_game { 585sub inject_resign_game {
513 my ($self, $msg) = @_; 586 my ($self, $msg) = @_;
514 587
515 sound::play 3, "resign"; 588 sound::play 3, "resign";
516 589
517 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 590 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
518 . "\n<user>" 591 . "\n<user>"
519 . (util::toxml $self->{user}[$msg->{player}]->as_string) 592 . (util::toxml $self->{user}[$msg->{player}]->as_string)
520 . "</user> resigned.</infoblock>"); 593 . "</user> resigned.</infoblock>");
521} 594}
522 595
523sub inject_final_result { 596sub inject_final_result {
524 my ($self, $msg) = @_; 597 my ($self, $msg) = @_;
525 598
526 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 599 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
527 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 600 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
528 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 601 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
529 . "</infoblock>" 602 . "</infoblock>"
530 ); 603 );
531} 604}
532 605
606sub inject_req_undo {
607 my ($self, $msg) = @_;
608
609 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
610 return if $inlay->{ignore};
611
612 $inlay->{count}++;
613 $inlay->clear;
614 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
615 $inlay->append_button ("Grant", sub {
616 $inlay->clear;
617 $self->send (grant_undo => channel => $self->{channel});
618 });
619 $inlay->append_button ("Ignore", sub {
620 $inlay->clear;
621 $inlay->{ignore} = 1;
622 # but leave inlay, so further undo requests get counted
623 });
624
625}
626
627sub inject_new_game {
628 my ($self, $msg) = @_;
629
630 $self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>");
631 delete $self->{cid};
632}
633
634sub draw_challenge {
635 my ($self, $id) = @_;
636
637 my $info = $self->{challenge}{$id};
638 my $inlay = $info->{inlay};
639 my $rules = $info->{rules};
640 warn "drawchal $id\n";#d#
641# use PApp::Util; warn PApp::Util::dumpval $challenge;#d#
642
643 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
644 my $opponent = $as_black ? $info->{white} : $info->{black};
645
646 my ($size, $time, $interval, $count);
647
648 if (!$self->{channel}) {
649 $inlay->append_text ("\nNotes: ");
650 $inlay->append_entry (\$info->{notes}, 20, "");
651 $inlay->append_text ("\nGlobal Offer: ");
652 $inlay->append_optionmenu (\$info->{flags},
653 0 => "No",
654 2 => "Yes",
655 );
656 } else {
657 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
658 }
659
660 $inlay->append_text ("\nType: ");
661 $inlay->append_optionmenu (
662 \$info->{gametype},
663 GAMETYPE_DEMONSTRATION , "Demonstration",
664 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)",
665 GAMETYPE_TEACHING , "Teaching",
666 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)",
667 GAMETYPE_SIMUL , "Simul (not yet!)",
668 GAMETYPE_FREE , "Free",
669 GAMETYPE_RATED , "Rated",
670 sub {
671 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
672 },
673 );
674
675 if ($self->{channel}) {
676 $inlay->append_text ("\nMy Colour: ");
677 $inlay->append_optionmenu (
678 \$as_black,
679 0 => "White",
680 1 => "Black",
681 sub {
682 if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
683 ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
684 }
685 }
686 );
687 }
688
689 $inlay->append_text ("\nRuleset: ");
690 $inlay->append_optionmenu (
691 \$info->{rules}{ruleset},
692 RULESET_JAPANESE , "Japanese",
693 RULESET_CHINESE , "Chinese",
694 RULESET_AGA , "AGA",
695 RULESET_NEW_ZEALAND, "New Zealand",
696 );
697
698 $inlay->append_text ("\nSize: ");
699 $size = $inlay->append_optionmenu (
700 \$info->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38
701 );
702
703 if ($self->{channel}) {
704 $inlay->append_text ("\nHandicap: ");
705 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
706
707 $inlay->append_text ("\nKomi: ");
708 $inlay->append_entry (\$info->{rules}{komi}, 5);
709 }
710
711 $inlay->append_text ("\nTimesys: ");
712 $inlay->append_optionmenu (
713 \$info->{rules}{timesys},
714 &TIMESYS_NONE => "None",
715 &TIMESYS_ABSOLUTE => "Absolute",
716 &TIMESYS_BYO_YOMI => "Byo Yomi",
717 &TIMESYS_CANADIAN => "Canadian",
718 sub {
719 my ($new) = @_;
720
721 if ($new eq TIMESYS_NONE) {
722 $time->hide;
723 $interval->hide;
724 $count->hide;
725 } else {
726 $time->show;
727 $time->set_text ($self->{app}{defaults}{time});
728 if ($new eq TIMESYS_ABSOLUTE) {
729 $interval->hide;
730 $count->hide;
731 } else {
732 $interval->show;
733 $count->show;
734 if ($new eq TIMESYS_BYO_YOMI) {
735 $interval->set_text ($self->{app}{defaults}{byo_time});
736 $count->set_text ($self->{app}{defaults}{byo_period});
737 } elsif ($new eq TIMESYS_CANADIAN) {
738 $interval->set_text ($self->{app}{defaults}{can_time});
739 $count->set_text ($self->{app}{defaults}{can_period});
740 }
741 }
742 }
743 }
744 );
745
746 $inlay->append_text ("\nMain Time: ");
747 $time = $inlay->append_entry (\$info->{rules}{time}, 5);
748 $inlay->append_text ("\nInterval: ");
749 $interval = $inlay->append_entry (\$info->{rules}{interval}, 3);
750 $inlay->append_text ("\nPeriods/Stones: ");
751 $count = $inlay->append_entry (\$info->{rules}{count}, 2);
752
753 $inlay->append_text ("\n");
754
755 if (!$self->{channel}) {
756 $inlay->append_button ("Create Challenge", sub {
757 $inlay->clear;
758 $self->{cid} = $self->{conn}->alloc_clientid;
759 $self->send (new_game =>
760 channel => delete $self->{roomid},
761 gametype => $info->{gametype},
762 cid => $self->{cid},
763 flags => $info->{flags},
764 rules => $info->{rules},
765 notes => $info->{notes},
766 );
767 });
768 } else {
769 $inlay->append_button ("OK", sub {
770 $inlay->clear;
771 $self->send (challenge =>
772 channel => $self->{channel},
773 black => $info->{black},
774 white => $info->{white},
775 gametype => $info->{gametype},
776 cid => $info->{cid},
777 rules => $info->{rules},
778 );
779 });
780 if (exists $self->{challenge}{""}) {
781 $inlay->append_button ("Reject", sub {
782 $inlay->clear;
783 $self->send (reject_challenge =>
784 channel => $self->{channel},
785 name => $opponent->{name},
786 gametype => $info->{gametype},
787 cid => $info->{cid},
788 rules => $info->{rules},
789 );
790 });
791 }
792 }
793}
794
795sub draw_users {
796 my ($self, $inlay) = @_;
797
798 for (sort keys %{$self->{users}}) {
799 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
800 }
801}
802
533sub event_challenge { 803sub event_challenge {
534 my ($self, $challenge) = @_;
535
536 use KGS::Listener::Debug;
537 $self->{text}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
538}
539
540sub destroy {
541 my ($self) = @_; 804 my ($self, $info) = @_;
542 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 805
543 for BLACK, WHITE; 806 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
544 $self->SUPER::destroy; 807 my $opponent = $as_black ? $info->{white} : $info->{black};
545 delete $self->{app}{gamelist}{game}{$self->{channel}}; 808
809 my $id = $opponent->{name};
810
811 warn "challenge from $opponent->{name}\n";#d#
812
813 $self->{challenge}{$id} = $info;
814 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
815 exists $self->{challenge}{""}
816 ? "Challenge from $opponent->{name}"
817 : "Challenge to $opponent->{name}",
818 sub {
819 $self->{challenge}{$id}{inlay} = $_[0];
820 $self->draw_challenge ($id);
821 },
822 1 || !exists $self->{challenge}{""} # only open when not offerer
823 );
546} 824}
547 825
5481; 8261;
549 827

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines