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.88 by pcg, Fri May 21 16:13:41 2004 UTC vs.
Revision 1.100 by pcg, Sun May 30 03:24:47 2004 UTC

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

Diff Legend

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