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.91 by pcg, Sun May 23 02:23:54 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);
229
230 # RIGHT PANE
231
232 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
233 $hpane->set (position_set => 1);
234
235 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
230 236
231 { 237 {
232 $frame->add (my $vbox = new Gtk2::VBox); 238 $frame->add (my $vbox = new Gtk2::VBox);
233 $vbox->add ($self->{title} = new Gtk2::Label $title); 239 $vbox->add ($self->{title} = new Gtk2::Label $title);
234 240
… …
245 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 251 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
246 } 252 }
247 253
248 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size}); 254 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
249 255
250 # RIGHT PANE
251
252 $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1);
253 $hpane->set (position_set => 1);
254 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
255
256 $self->{vpane}->add (my $sw = new Gtk2::ScrolledWindow);
257 $sw->set_policy ("automatic", "always");
258
259 $sw->add ($self->{userlist} = new userlist);
260
261 $self->{vpane}->add (my $vbox = new Gtk2::VBox);
262
263 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 256 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
264 257
265 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_) 258 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
266 for COLOUR_WHITE, COLOUR_BLACK; 259 for COLOUR_WHITE, COLOUR_BLACK;
267 260
268 $vbox->pack_start (($self->{chat} = new chat), 1, 1, 0); 261 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
269 weaken $self->{chat}; 262
263 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Rules", sub { $self->draw_rules (@_) }, 1);
264 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 0);
270 265
271 $self->{chat}->signal_connect (command => sub { 266 $self->{chat}->signal_connect (command => sub {
272 my ($chat, $cmd, $arg) = @_; 267 my ($chat, $cmd, $arg) = @_;
273 if ($cmd eq "rsave") { 268 if ($cmd eq "rsave") {
274 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d# 269 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
… …
281} 276}
282 277
283sub event_update_users { 278sub event_update_users {
284 my ($self, $add, $update, $remove) = @_; 279 my ($self, $add, $update, $remove) = @_;
285 280
286 return unless $self->{userlist};
287
288 $self->{userlist}->update ($add, $update, $remove); 281# $self->{userlist}->update ($add, $update, $remove);
282
283 $self->{users_inlay}->refresh;
289 284
290 my %important; 285 my %important;
291 $important{$self->{user1}{name}}++; 286 $important{$self->{user1}{name}}++;
292 $important{$self->{user2}{name}}++; 287 $important{$self->{user2}{name}}++;
293 $important{$self->{user3}{name}}++; 288 $important{$self->{user3}{name}}++;
… …
306sub join { 301sub join {
307 my ($self) = @_; 302 my ($self) = @_;
308 return if $self->{joined}; 303 return if $self->{joined};
309 304
310 $self->SUPER::join; 305 $self->SUPER::join;
311
312 $self->show_all;
313} 306}
314 307
315sub update_board { 308sub update_board {
316 my ($self) = @_; 309 my ($self) = @_;
317 return unless $self->{path}; 310 return unless $self->{path};
… …
397sub event_join { 390sub event_join {
398 my ($self) = @_; 391 my ($self) = @_;
399 392
400 $self->SUPER::event_join (@_); 393 $self->SUPER::event_join (@_);
401 $self->event_update_game; 394 $self->event_update_game;
395 $self->show_all;
402} 396}
403 397
404sub event_part { 398sub event_part {
405 my ($self) = @_; 399 my ($self) = @_;
406 400
… …
427 421
428 $self->{user}[COLOUR_BLACK] = $self->{user1}; 422 $self->{user}[COLOUR_BLACK] = $self->{user1};
429 $self->{user}[COLOUR_WHITE] = $self->{user2}; 423 $self->{user}[COLOUR_WHITE] = $self->{user2};
430 424
431 # show board 425 # show board
432
433 if ($self->is_inprogress) { 426 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; 427 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
436 } else { 428 if (my $ch = delete $self->{challenge}) {
437 $self->{left}->remove ($self->{boardbox}) if $self->{boardbox}->parent; 429 (delete $_->{inlay})->clear for values %$ch;
438 $self->{left}->add ($self->{challenge}->widget) unless $self->{challenge}->widget->parent; 430 }
439 } 431 }
432
440 $self->{left}->show_all; 433 $self->{left}->show_all;
441 434
442 # view text 435 # view text
443 436
444 eval { #d# 437 eval { #d#
… …
480 }; 473 };
481 474
482 $self->{chat}->append_text ($text); 475 $self->{chat}->append_text ($text);
483} 476}
484 477
485sub event_update_rules { 478sub draw_rules {
486 my ($self, $rules) = @_; 479 my ($self, $inlay) = @_;
487 480
488 if ($self->{user}) { 481 my $rules = $self->{rules};
489 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
490 for COLOUR_BLACK, COLOUR_WHITE;
491 }
492 482
493 sound::play 3, "gamestart"; 483 my $text = "";
494
495 my $text = "\n<header>Game Rules</header>";
496 484
497 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 485 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
498 486
499 $text .= "\nTime: "; 487 $text .= "\nTime: ";
500 488
… …
509 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 497 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
510 $text .= util::format_time $rules->{time}; 498 $text .= util::format_time $rules->{time};
511 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 499 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
512 } 500 }
513 501
514 $self->{chat}->append_text ("<infoblock>$text</infoblock>"); 502 $inlay->append_text ("<infoblock>$text</infoblock>");
503}
504
505sub event_update_rules {
506 my ($self, $rules) = @_;
507
508 $self->{rules} = $rules;
509
510 if ($self->{user}) {
511 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
512 for COLOUR_BLACK, COLOUR_WHITE;
513 }
514
515 sound::play 3, "gamestart";
516
517 $self->{rules_inlay}->refresh;
515} 518}
516 519
517sub inject_resign_game { 520sub inject_resign_game {
518 my ($self, $msg) = @_; 521 my ($self, $msg) = @_;
519 522
… …
533 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 536 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
534 . "</infoblock>" 537 . "</infoblock>"
535 ); 538 );
536} 539}
537 540
541sub draw_challenge {
542 my ($self, $c) = @_;
543
544 my $inlay = $c->{inlay};
545 my $challenge = $c->{challenge};
546 my $rules = $challenge->{rules};
547
548 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
549 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
550
551 $inlay->append_text ("\n<challenge>Challenge to <user>" . $opponent->as_string . "</user></challenge>");
552 $inlay->append_text ("\nHandicap: $rules->{handicap}");
553
554#bless( (
555# gametype => 3,
556# user1 => bless( {
557# flags => 2633,
558# name => 'dorkusx'
559# }, 'KGS::User' ),
560# rules => bless( {
561# count => 5,
562# time => 900,
563# timesys => 2,
564# interval => 30,
565# komi => '6.5',
566# size => 19,
567# ruleset => 0,
568# handicap => 0
569# }, 'KGS::Rules' ),
570# user2 => bless( {
571# flags => 436220808,
572# name => 'Nerdamus'
573# }, 'KGS::User' )
574# ), 'KGS::Challenge' )
575}
576
577sub draw_users {
578 my ($self, $inlay) = @_;
579
580 for (sort keys %{$self->{users}}) {
581 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
582 }
583}
584
538sub event_challenge { 585sub event_challenge {
539 my ($self, $challenge) = @_; 586 my ($self, $challenge) = @_;
540 587
588 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
589 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
590
591 my $c = $self->{challenge}{$opponent->{name}} ||= {};
592
593 $c->{inlay} ||= $self->{chat}->new_inlay;
594 $c->{challenge} = $challenge;
595
596 $self->draw_challenge ($c);
597
541 use KGS::Listener::Debug; 598# require KGS::Listener::Debug;
542 $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); 599# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
543} 600}
544 601
5451; 6021;
546 603

Diff Legend

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