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.84 by pcg, Thu May 20 23:09:53 2004 UTC vs.
Revision 1.89 by pcg, Fri May 21 17:15:33 2004 UTC

… …
18 my $self = shift; 18 my $self = shift;
19 19
20 $self->signal_connect (destroy => sub { $_[0]->stop }); 20 $self->signal_connect (destroy => sub { $_[0]->stop });
21 21
22 $self->{set} = sub { }; 22 $self->{set} = sub { };
23 $self->{format} = sub { "ERROR" }; 23 $self->{format} = sub { "???" };
24} 24}
25 25
26sub configure { 26sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_; 27 my ($self, $timesys, $main, $interval, $count) = @_;
28 28
… …
196 196
197use POSIX qw(ceil); 197use POSIX qw(ceil);
198 198
199sub new { 199sub new {
200 my ($self, %arg) = @_; 200 my ($self, %arg) = @_;
201
202 $self = $self->Glib::Object::new; 201 $self = $self->Glib::Object::new;
203 $self->{$_} = delete $arg{$_} for keys %arg; 202 $self->{$_} = delete $arg{$_} for keys %arg;
204 203
205 $self->listen ($self->{conn}); 204 $self->listen ($self->{conn});
206 205
207 gtk::state $self, "game::window", undef, window_size => [600, 500]; 206 gtk::state $self, "game::window", undef, window_size => [600, 500];
208 207
209 $self->signal_connect (delete_event => sub { $self->part; 1 }); 208 $self->signal_connect (delete_event => sub { $self->part; 1 });
210 $self->signal_connect (destroy => sub { %{$_[0]} = () }); 209 $self->signal_connect (destroy => sub {
210 $self->unlisten;
211 delete $self->{app}{game}{$self->{channel}};
212 %{$_[0]} = ();
213 });#d#
211 214
212 $self->add (my $hpane = new Gtk2::HPaned); 215 $self->add (my $hpane = new Gtk2::HPaned);
213 gtk::state $hpane, "game::hpane", undef, position => 500; 216 gtk::state $hpane, "game::hpane", undef, position => 500;
214 217
215 # LEFT PANE 218 # LEFT PANE
… …
218 221
219 $self->{boardbox} = new Gtk2::VBox; 222 $self->{boardbox} = new Gtk2::VBox;
220 223
221 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 224 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
222 225
223 # challenge
224
225 $self->{challenge} = new challenge channel => $self->{channel};
226
227 # board box (aspect/canvas) 226 # board box (aspect/canvas)
228 227
229 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 228 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
230 229
231 { 230 {
… …
251 250
252 $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1); 251 $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1);
253 $hpane->set (position_set => 1); 252 $hpane->set (position_set => 1);
254 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 253 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
255 254
256 $self->{vpane}->add (my $sw = new Gtk2::ScrolledWindow); 255# $self->{vpane}->add (my $sw = new Gtk2::ScrolledWindow);
257 $sw->set_policy ("automatic", "always"); 256# $sw->set_policy ("automatic", "always");
258
259 $sw->add ($self->{userlist} = new userlist); 257# $sw->add ($self->{userlist} = new userlist);
260 258
261 $self->{vpane}->add (my $vbox = new Gtk2::VBox); 259 $self->{vpane}->add (my $vbox = new Gtk2::VBox);
262 260
263 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 261 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
264 262
265 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_) 263 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
266 for COLOUR_WHITE, COLOUR_BLACK; 264 for COLOUR_WHITE, COLOUR_BLACK;
267 265
268 $vbox->pack_start (($self->{chat} = new chat), 1, 1, 0); 266 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
269 weaken $self->{chat}; 267
268 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Rules", sub { $self->draw_rules (@_) }, 1);
269 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 0);
270 270
271 $self->{chat}->signal_connect (command => sub { 271 $self->{chat}->signal_connect (command => sub {
272 my ($chat, $cmd, $arg) = @_; 272 my ($chat, $cmd, $arg) = @_;
273 if ($cmd eq "rsave") { 273 if ($cmd eq "rsave") {
274 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d# 274 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
… …
281} 281}
282 282
283sub event_update_users { 283sub event_update_users {
284 my ($self, $add, $update, $remove) = @_; 284 my ($self, $add, $update, $remove) = @_;
285 285
286 return unless $self->{userlist};
287
288 $self->{userlist}->update ($add, $update, $remove); 286# $self->{userlist}->update ($add, $update, $remove);
287
288 $self->{users_inlay}->refresh;
289 289
290 my %important; 290 my %important;
291 $important{$self->{user1}{name}}++; 291 $important{$self->{user1}{name}}++;
292 $important{$self->{user2}{name}}++; 292 $important{$self->{user2}{name}}++;
293 $important{$self->{user3}{name}}++; 293 $important{$self->{user3}{name}}++;
… …
306sub join { 306sub join {
307 my ($self) = @_; 307 my ($self) = @_;
308 return if $self->{joined}; 308 return if $self->{joined};
309 309
310 $self->SUPER::join; 310 $self->SUPER::join;
311
312 $self->show_all;
313} 311}
314 312
315sub update_board { 313sub update_board {
316 my ($self) = @_; 314 my ($self) = @_;
317 return unless $self->{path}; 315 return unless $self->{path};
… …
397sub event_join { 395sub event_join {
398 my ($self) = @_; 396 my ($self) = @_;
399 397
400 $self->SUPER::event_join (@_); 398 $self->SUPER::event_join (@_);
401 $self->event_update_game; 399 $self->event_update_game;
400 $self->show_all;
402} 401}
403 402
404sub event_part { 403sub event_part {
405 my ($self) = @_; 404 my ($self) = @_;
406 405
… …
427 426
428 $self->{user}[COLOUR_BLACK] = $self->{user1}; 427 $self->{user}[COLOUR_BLACK] = $self->{user1};
429 $self->{user}[COLOUR_WHITE] = $self->{user2}; 428 $self->{user}[COLOUR_WHITE] = $self->{user2};
430 429
431 # show board 430 # show board
432
433 if ($self->is_inprogress) { 431 if ($self->is_inprogress) {
434 $self->{left}->remove ($self->{challenge}->widget) if $self->{challenge} && $self->{boardbox}->parent;
435 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent; 432 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
436 } else { 433 if (my $ch = delete $self->{challenge}) {
437 $self->{left}->remove ($self->{boardbox}) if $self->{boardbox}->parent; 434 (delete $_->{inlay})->clear for values %$ch;
438 $self->{left}->add ($self->{challenge}->widget) unless $self->{challenge}->widget->parent; 435 }
439 } 436 }
437
440 $self->{left}->show_all; 438 $self->{left}->show_all;
441 439
442 # view text 440 # view text
443 441
444 eval { #d# 442 eval { #d#
… …
480 }; 478 };
481 479
482 $self->{chat}->append_text ($text); 480 $self->{chat}->append_text ($text);
483} 481}
484 482
485sub event_update_rules { 483sub draw_rules {
486 my ($self, $rules) = @_; 484 my ($self, $inlay) = @_;
487 485
488 if ($self->{user}) { 486 my $rules = $self->{rules};
489 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
490 for COLOUR_BLACK, COLOUR_WHITE;
491 }
492 487
493 sound::play 3, "gamestart"; 488 my $text = "";
494
495 my $text = "\n<header>Game Rules</header>";
496 489
497 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 490 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
498 491
499 $text .= "\nTime: "; 492 $text .= "\nTime: ";
500 493
… …
509 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 502 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
510 $text .= util::format_time $rules->{time}; 503 $text .= util::format_time $rules->{time};
511 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 504 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
512 } 505 }
513 506
514 $self->{chat}->append_text ("<infoblock>$text</infoblock>"); 507 $inlay->append_text ("<infoblock>$text</infoblock>");
508}
509
510sub event_update_rules {
511 my ($self, $rules) = @_;
512
513 $self->{rules} = $rules;
514
515 if ($self->{user}) {
516 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
517 for COLOUR_BLACK, COLOUR_WHITE;
518 }
519
520 sound::play 3, "gamestart";
521
522 $self->{rules_inlay}->refresh;
515} 523}
516 524
517sub inject_resign_game { 525sub inject_resign_game {
518 my ($self, $msg) = @_; 526 my ($self, $msg) = @_;
519 527
… …
533 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 541 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
534 . "</infoblock>" 542 . "</infoblock>"
535 ); 543 );
536} 544}
537 545
546sub draw_challenge {
547 my ($self, $c) = @_;
548
549 my $inlay = $c->{inlay};
550 my $challenge = $c->{challenge};
551 my $rules = $challenge->{rules};
552
553 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
554 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
555
556 $inlay->append_text ("\n<challenge>Challenge to <user>" . $opponent->as_string . "</user></challenge>");
557 $inlay->append_text ("\nHandicap: $rules->{handicap}");
558
559#bless( (
560# gametype => 3,
561# user1 => bless( {
562# flags => 2633,
563# name => 'dorkusx'
564# }, 'KGS::User' ),
565# rules => bless( {
566# count => 5,
567# time => 900,
568# timesys => 2,
569# interval => 30,
570# komi => '6.5',
571# size => 19,
572# ruleset => 0,
573# handicap => 0
574# }, 'KGS::Rules' ),
575# user2 => bless( {
576# flags => 436220808,
577# name => 'Nerdamus'
578# }, 'KGS::User' )
579# ), 'KGS::Challenge' )
580}
581
582sub draw_users {
583 my ($self, $inlay) = @_;
584
585 for (sort keys %{$self->{users}}) {
586 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
587 }
588}
589
538sub event_challenge { 590sub event_challenge {
539 my ($self, $challenge) = @_; 591 my ($self, $challenge) = @_;
540 592
593 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
594 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
595
596 my $c = $self->{challenge}{$opponent->{name}} ||= {};
597
598 $c->{inlay} ||= $self->{chat}->new_inlay;
599 $c->{challenge} = $challenge;
600
601 $self->draw_challenge ($c);
602
541 use KGS::Listener::Debug; 603# require KGS::Listener::Debug;
542 $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); 604# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
543} 605}
544 606
5451; 6071;
546 608

Diff Legend

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