--- kgsueme/kgsueme/game.pl 2004/05/21 16:13:41 1.88 +++ kgsueme/kgsueme/game.pl 2004/05/30 03:24:47 1.100 @@ -187,6 +187,7 @@ use KGS::Game::Board; use Gtk2::GoBoard; +use Gtk2::GoBoard::Constants; use Glib::Object::Subclass Gtk2::Window; @@ -201,11 +202,8 @@ $self = $self->Glib::Object::new; $self->{$_} = delete $arg{$_} for keys %arg; - $self->listen ($self->{conn}); - gtk::state $self, "game::window", undef, window_size => [600, 500]; - $self->signal_connect (delete_event => sub { $self->part; 1 }); $self->signal_connect (destroy => sub { $self->unlisten; delete $self->{app}{game}{$self->{channel}}; @@ -225,7 +223,14 @@ # board box (aspect/canvas) - $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); + #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); + + # RIGHT PANE + + $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1); + $hpane->set (position_set => 1); + + $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0); { $frame->add (my $vbox = new Gtk2::VBox); @@ -244,53 +249,61 @@ $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); } - $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size}); - - # RIGHT PANE - - $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1); - $hpane->set (position_set => 1); - gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; - -# $self->{vpane}->add (my $sw = new Gtk2::ScrolledWindow); -# $sw->set_policy ("automatic", "always"); -# $sw->add ($self->{userlist} = new userlist); - - $self->{vpane}->add (my $vbox = new Gtk2::VBox); - $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0); $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_) for COLOUR_WHITE, COLOUR_BLACK; + + $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0); + + #$buttonbox->I# $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0); - $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Rules", sub { $self->draw_rules (@_) }, 1); - $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 0); + $self->set_channel ($self->{channel}); - $self->{chat}->signal_connect (command => sub { - my ($chat, $cmd, $arg) = @_; - if ($cmd eq "rsave") { - Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d# - } else { - $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self); - } - }); + $self->show_all; $self; } +sub set_channel { + my ($self, $channel) = @_; + + $self->{channel} = $channel; + + if ($self->{channel} > 0) { + $self->listen ($self->{conn}); + + $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1); + $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1); + + $self->signal_connect (delete_event => sub { $self->part; 1 }); + $self->{chat}->signal_connect (command => sub { + my ($chat, $cmd, $arg) = @_; + if ($cmd eq "rsave") { + Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d# + } else { + $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self); + } + }); + } +} + sub event_update_users { my ($self, $add, $update, $remove) = @_; # $self->{userlist}->update ($add, $update, $remove); + $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy + for @$remove; + $self->{users_inlay}->refresh; my %important; - $important{$self->{user1}{name}}++; - $important{$self->{user2}{name}}++; - $important{$self->{user3}{name}}++; + $important{$self->{black}{name}}++; + $important{$self->{white}{name}}++; + $important{$self->{owner}{name}}++; if (my @users = grep $important{$_->{name}}, @$add) { $self->{chat}->append_text ("\n
Joins:
"); @@ -300,7 +313,6 @@ $self->{chat}->append_text ("\n
Parts:
"); $self->{chat}->append_text (" " . $_->as_string . "") for @users; } - } sub join { @@ -310,13 +322,52 @@ $self->SUPER::join; } +sub update_cursor { + my ($self) = @_; + + my $move = int $self->{moveadj}->get_value; + my $cb; + + warn sprintf "move %d spath %d\n", $move, scalar @{$self->{path}};#d# + warn "isact " . $self->is_active;#d# + warn "flags $self->{flags}\n";#d# + warn "handi $self->{handicap}\n";#d# + + my $running = $move == @{$self->{path}}; # && $self->is_active; + + delete $self->{board_click}; + + warn "plaiyng $self->{playing} running $running last $self->{cur_board}{last}\n";#d# + if ($self->{teacher} eq $self->{app}{conn}) { + #TODO# # teaching mode not implemented + $self->{board}->set (cursor_mask => 0, cursor_value => 0); + } elsif (!$self->{playing} || !$running) { + $self->{board}->set (cursor_mask => 0, cursor_value => 0); + #TODO# # implement coordinate-grabbing + } elsif ($self->{black}{name} eq $self->{conn}{name} && $self->{cur_board}{last} == COLOUR_WHITE) { + $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_B | MARK_GRAYED); + $self->{board_click} = sub { + $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]); + $self->{board}->set (cursor_mask => 0, cursor_value => 0); + delete $self->{board_click}; + }; + } elsif ($self->{white}{name} eq $self->{conn}{name} && $self->{cur_board}{last} == COLOUR_BLACK) { + $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_W | MARK_GRAYED); + $self->{board_click} = sub { + $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]); + $self->{board}->set (cursor_mask => 0, cursor_value => 0); + delete $self->{board_click}; + }; + } +} + sub update_board { my ($self) = @_; return unless $self->{path}; my $move = int $self->{moveadj}->get_value; - my $running = $move == @{$self->{path}}; + my $running = $move == @{$self->{path}} && !$self->{teacher}; $self->{board_label}->set_text ("Move " . ($move - 1)); @@ -333,6 +384,8 @@ } $self->{board}->set_board ($self->{cur_board}); + + $self->update_cursor; } sub event_update_tree { @@ -396,8 +449,8 @@ my ($self) = @_; $self->SUPER::event_join (@_); + $self->init_tree; $self->event_update_game; - $self->show_all; } sub event_part { @@ -410,83 +463,75 @@ sub event_move { my ($self, $pass) = @_; sound::play 1, $pass ? "pass" : "move"; + + if ($self->{undo_inlay}) { + (delete $self->{undo_inlay})->clear; + } } sub event_update_game { my ($self) = @_; + $self->SUPER::event_update_game; return unless $self->{joined}; + $self->{playing} = $self->{teacher} eq $self->{conn}{name} + || $self->is_playing ($self->{conn}{name}); + my $title = defined $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window"; $self->set_title("KGS Game $title"); $self->{title}->set_text ($title); - $self->{user}[COLOUR_BLACK] = $self->{user1}; - $self->{user}[COLOUR_WHITE] = $self->{user2}; + $self->{user}[COLOUR_BLACK] = $self->{black}; + $self->{user}[COLOUR_WHITE] = $self->{white}; # show board if ($self->is_inprogress) { - $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent; + if (!$self->{boardbox}->parent) { + $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size}); + $self->{left}->add ($self->{boardbox}); + $self->{board}->signal_connect (button_release => sub { + if ($_[1] == 1) { + $self->{board_click}->($_[2], $_[3]) if $self->{board_click}; + } + }); + } if (my $ch = delete $self->{challenge}) { - (delete $_->{inlay})->clear for values %$ch; + $_->{inlay}->destroy for values %$ch; } + $self->update_cursor; } $self->{left}->show_all; - # view text + $self->{rules_inlay}->refresh; - eval { #d# - my @ga; - $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) - . " (" . (util::toxml $gameopt{$self->option}) . ")"; - $ga[1] = "\nFlags:"; - $ga[1] .= " started" if $self->is_inprogress; - $ga[1] .= " adjourned" if $self->is_adjourned; - $ga[1] .= " scored" if $self->is_scored; - $ga[1] .= " saved" if $self->is_saved; - - $ga[2] = "\nOwner: " . (util::toxml $self->{user3}->as_string) . "" - if $self->{user3}->is_inprogress; - - $ga[3] = "\nPlayers: " . (util::toxml $self->{user2}->as_string) . "" - . " vs. " . (util::toxml $self->{user1}->as_string) . "" - if $self->is_inprogress; - - if ($self->is_inprogress) { - $ga[4] = "\nHandicap: " . $self->{handicap}; - $ga[5] = "\nKomi: " . $self->{komi}; - $ga[6] = "\nSize: " . $self->size_string; - } - - if ($self->is_scored) { - $ga[7] = "\nResult: " . $self->score_string; - } - - $text = "\n
Game Update
"; - for (0..7) { - if ($self->{gatext}[$_] ne $ga[$_]) { - $text .= $ga[$_]; - } - } - $text .= ""; - - $self->{gatext} = \@ga; - }; - - $self->{chat}->append_text ($text); } -sub draw_rules { +sub draw_setup { my ($self, $inlay) = @_; + return unless $self->{joined}; + my $rules = $self->{rules}; my $text = ""; + $text .= "\nTeacher: " . (util::toxml $self->{teacher}) . "" + if $self->{teacher}; + + $text .= "\nOwner: " . (util::toxml $self->{owner}->as_string) . "" + if $self->{owner}->is_valid; + + if ($self->is_inprogress) { + $text .= "\nPlayers: " . (util::toxml $self->{white}->as_string) . "" + . " vs. " . (util::toxml $self->{black}->as_string) . ""; + } + $text .= "\nType: " . util::toxml $gametype{$self->type}; + $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; $text .= "\nTime: "; @@ -504,7 +549,25 @@ $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; } + $text .= "\nFlags:"; + $text .= " private" if $self->is_private; + $text .= " started" if $self->is_inprogress; + $text .= " adjourned" if $self->is_adjourned; + $text .= " scored" if $self->is_scored; + $text .= " saved" if $self->is_saved; + + if ($self->is_inprogress) { + $text .= "\nHandicap: " . $self->{handicap}; + $text .= "\nKomi: " . $self->{komi}; + $text .= "\nSize: " . $self->size_string; + } + + if ($self->is_scored) { + $text .= "\nResult: " . $self->score_string; + } + $inlay->append_text ("$text"); + } sub event_update_rules { @@ -519,20 +582,29 @@ sound::play 3, "gamestart"; - $self->draw_rules ($self->{rules_inlay}); + $self->{rules_inlay}->refresh; } -sub inject_resign_game { - my ($self, $msg) = @_; +sub event_resign_game { + my ($self, $player) = @_; sound::play 3, "resign"; - $self->{chat}->append_text ("\n
Resign
" . "\n" . (util::toxml $self->{user}[$msg->{player}]->as_string) . " resigned."); } +sub event_out_of_time { + my ($self, $player) = @_; + + sound::play 3, "timewin"; + $self->{chat}->append_text ("\n
Time Over
" + . "\n" + . (util::toxml $self->{user}[$msg->{player}]->as_string) + . " ran out of time."); +} + sub inject_final_result { my ($self, $msg) = @_; @@ -543,65 +615,224 @@ ); } +sub inject_req_undo { + my ($self, $msg) = @_; + + my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay; + return if $inlay->{ignore}; + + $inlay->{count}++; + $inlay->clear; + $inlay->append_text ("\nUndo requested ($inlay->{count} times)\n"); + $inlay->append_button ("Grant", sub { + $inlay->clear; + $self->send (grant_undo => channel => $self->{channel}); + }); + $inlay->append_button ("Ignore", sub { + $inlay->clear; + $inlay->{ignore} = 1; + # but leave inlay, so further undo requests get counted + }); + +} + +sub inject_new_game { + my ($self, $msg) = @_; + + $self->{chat}->append_text ("\n
ACK from server ($msg->{cid} == $self->{cid})
"); + delete $self->{cid}; +} + sub draw_challenge { - my ($self, $c) = @_; + my ($self, $id) = @_; + + my $info = $self->{challenge}{$id}; + my $inlay = $info->{inlay}; + my $rules = $info->{rules}; + warn "drawchal $id\n";#d# +# use PApp::Util; warn PApp::Util::dumpval $challenge;#d# + + my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;; + my $opponent = $as_black ? $info->{white} : $info->{black}; + + my ($size, $time, $interval, $count); + + if (!$self->{channel}) { + $inlay->append_text ("\nNotes: "); + $inlay->append_entry (\$info->{notes}, 20, ""); + $inlay->append_text ("\nGlobal Offer: "); + $inlay->append_optionmenu (\$info->{flags}, + 0 => "No", + 2 => "Yes", + ); + } else { + $inlay->append_text ("\nNotes: " . util::toxml $info->{notes}); + } + + $inlay->append_text ("\nType: "); + $inlay->append_optionmenu ( + \$info->{gametype}, + GAMETYPE_DEMONSTRATION , "Demonstration", + GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)", + GAMETYPE_TEACHING , "Teaching", + GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)", + GAMETYPE_SIMUL , "Simul (not yet!)", + GAMETYPE_FREE , "Free", + GAMETYPE_RATED , "Rated", + sub { + $size->set_history (2) if $_[0] eq GAMETYPE_RATED; + }, + ); + + if ($self->{channel}) { + $inlay->append_text ("\nMy Colour: "); + $inlay->append_optionmenu ( + \$as_black, + 0 => "White", + 1 => "Black", + sub { + if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) { + ($info->{black}, $info->{white}) = ($info->{white}, $info->{black}); + } + } + ); + } + + $inlay->append_text ("\nRuleset: "); + $inlay->append_optionmenu ( + \$info->{rules}{ruleset}, + RULESET_JAPANESE , "Japanese", + RULESET_CHINESE , "Chinese", + RULESET_AGA , "AGA", + RULESET_NEW_ZEALAND, "New Zealand", + ); + + $inlay->append_text ("\nSize: "); + $size = $inlay->append_optionmenu ( + \$info->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38 + ); + + if ($self->{channel}) { + $inlay->append_text ("\nHandicap: "); + $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9); + + $inlay->append_text ("\nKomi: "); + $inlay->append_entry (\$info->{rules}{komi}, 5); + } + + $inlay->append_text ("\nTimesys: "); + $inlay->append_optionmenu ( + \$info->{rules}{timesys}, + &TIMESYS_NONE => "None", + &TIMESYS_ABSOLUTE => "Absolute", + &TIMESYS_BYO_YOMI => "Byo Yomi", + &TIMESYS_CANADIAN => "Canadian", + sub { + my ($new) = @_; + + if ($new eq TIMESYS_NONE) { + $time->hide; + $interval->hide; + $count->hide; + } else { + $time->show; + $time->set_text ($self->{app}{defaults}{time}); + if ($new eq TIMESYS_ABSOLUTE) { + $interval->hide; + $count->hide; + } else { + $interval->show; + $count->show; + if ($new eq TIMESYS_BYO_YOMI) { + $interval->set_text ($self->{app}{defaults}{byo_time}); + $count->set_text ($self->{app}{defaults}{byo_period}); + } elsif ($new eq TIMESYS_CANADIAN) { + $interval->set_text ($self->{app}{defaults}{can_time}); + $count->set_text ($self->{app}{defaults}{can_period}); + } + } + } + } + ); - my $inlay = $c->{inlay}; - my $challenge = $c->{challenge}; - my $rules = $challenge->{rules}; - - my $as_black = $challenge->{user1}{name} eq $self->{conn}{name}; - my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1}; - - $inlay->append_text ("\nChallenge to " . $opponent->as_string . ""); - $inlay->append_text ("\nHandicap: $rules->{handicap}"); - -#bless( ( -# gametype => 3, -# user1 => bless( { -# flags => 2633, -# name => 'dorkusx' -# }, 'KGS::User' ), -# rules => bless( { -# count => 5, -# time => 900, -# timesys => 2, -# interval => 30, -# komi => '6.5', -# size => 19, -# ruleset => 0, -# handicap => 0 -# }, 'KGS::Rules' ), -# user2 => bless( { -# flags => 436220808, -# name => 'Nerdamus' -# }, 'KGS::User' ) -# ), 'KGS::Challenge' ) + $inlay->append_text ("\nMain Time: "); + $time = $inlay->append_entry (\$info->{rules}{time}, 5); + $inlay->append_text ("\nInterval: "); + $interval = $inlay->append_entry (\$info->{rules}{interval}, 3); + $inlay->append_text ("\nPeriods/Stones: "); + $count = $inlay->append_entry (\$info->{rules}{count}, 2); + + $inlay->append_text ("\n"); + + if (!$self->{channel}) { + $inlay->append_button ("Create Challenge", sub { + $inlay->clear; + $self->{cid} = $self->{conn}->alloc_clientid; + $self->send (new_game => + channel => delete $self->{roomid}, + gametype => $info->{gametype}, + cid => $self->{cid}, + flags => $info->{flags}, + rules => $info->{rules}, + notes => $info->{notes}, + ); + }); + } else { + $inlay->append_button ("OK", sub { + $inlay->clear; + $self->send (challenge => + channel => $self->{channel}, + black => $info->{black}, + white => $info->{white}, + gametype => $info->{gametype}, + cid => $info->{cid}, + rules => $info->{rules}, + ); + }); + if (exists $self->{challenge}{""}) { + $inlay->append_button ("Reject", sub { + $inlay->clear; + $self->send (reject_challenge => + channel => $self->{channel}, + name => $opponent->{name}, + gametype => $info->{gametype}, + cid => $info->{cid}, + rules => $info->{rules}, + ); + }); + } + } } sub draw_users { my ($self, $inlay) = @_; for (sort keys %{$self->{users}}) { - $inlay->append_text (" " . $self->{users}{$_}->as_string . ""); + $inlay->append_text (" " . $self->{users}{$_}->as_string . ""); } } sub event_challenge { - my ($self, $challenge) = @_; - - my $as_black = $challenge->{user1}{name} eq $self->{conn}{name}; - my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1}; + my ($self, $info) = @_; - my $c = $self->{challenge}{$opponent->{name}} ||= {}; + my $as_black = $info->{black}->{name} eq $self->{conn}{name}; + my $opponent = $as_black ? $info->{white} : $info->{black}; - $c->{inlay} ||= $self->{chat}->new_inlay; - $c->{challenge} = $challenge; + my $id = $opponent->{name}; - $self->draw_challenge ($c); + warn "challenge from $opponent->{name}\n";#d# -# require KGS::Listener::Debug; -# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); + $self->{challenge}{$id} = $info; + $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay ( + exists $self->{challenge}{""} + ? "Challenge from $opponent->{name}" + : "Challenge to $opponent->{name}", + sub { + $self->{challenge}{$id}{inlay} = $_[0]; + $self->draw_challenge ($id); + }, + 1 || !exists $self->{challenge}{""} # only open when not offerer + ); } 1;