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.81 by pcg, Fri Apr 2 23:22:30 2004 UTC vs.
Revision 1.95 by pcg, Fri May 28 23:19:59 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
… …
75 my $timer = $self->{time} + $self->{start} - $timestamp; 75 my $timer = $self->{time} + $self->{start} - $timestamp;
76 76
77 # 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,
78 # and this gives smoother timers ;) 78 # and this gives smoother timers ;)
79 my @format = $self->{format}->(int ($timer + 0.4)); 79 my @format = $self->{format}->(int ($timer + 0.4));
80 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); 80 $self->set_text ($self->{format}->(int ($timer + 0.4)));
81 81
82 $timer - int $timer; 82 $timer - int $timer;
83} 83}
84 84
85sub set_time { 85sub set_time {
… …
118 my ($self) = @_; 118 my ($self) = @_;
119 119
120 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 120 remove Glib::Source delete $self->{timeout} if $self->{timeout};
121} 121}
122 122
123sub destroy {
124 my ($self) = @_;
125 $self->stop;
126 $self->SUPER::destroy;
127}
128
129package game::userpanel; 123package game::userpanel;
130 124
131use base gtk::widget; 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 ];
132 130
133sub new { 131sub INIT_INSTANCE {
134 my $class = shift; 132 my ($self) = @_;
135 my $self = $class->SUPER::new(@_);
136 133
137 $self->{widget} = new Gtk2::HBox;
138
139 $self->{widget}->add (my $vbox = new Gtk2::VBox); 134 $self->add (my $vbox = new Gtk2::VBox);
140 135
141 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 136 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
142 $vbox->add ($self->{info} = new Gtk2::Label ""); 137 $vbox->add ($self->{info} = new Gtk2::Label "");
143 $vbox->add (($self->{clock} = new game::goclock)->widget); 138 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock};
144 139
145 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 140 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
146 141
147 $self; 142 $self;
148} 143}
… …
184 $self->{info}->set_text ("$captures pris."); 179 $self->{info}->set_text ("$captures pris.");
185} 180}
186 181
187package game; 182package game;
188 183
184use Scalar::Util qw(weaken);
185
189use KGS::Constants; 186use KGS::Constants;
190use KGS::Game::Board; 187use KGS::Game::Board;
191 188
192use Gtk2::GoBoard; 189use Gtk2::GoBoard;
193 190
191use Glib::Object::Subclass
192 Gtk2::Window;
193
194use base KGS::Listener::Game; 194use base KGS::Listener::Game;
195use base KGS::Game; 195use base KGS::Game;
196 196
197use base gtk::widget;
198
199use POSIX qw(ceil); 197use POSIX qw(ceil);
200 198
201sub new { 199sub new {
202 my $self = shift; 200 my ($self, %arg) = @_;
203 $self = $self->SUPER::new(@_); 201 $self = $self->Glib::Object::new;
202 $self->{$_} = delete $arg{$_} for keys %arg;
204 203
205 $self->listen($self->{conn}); 204 $self->listen ($self->{conn});
206 205
207 $self->{window} = new Gtk2::Window 'toplevel';
208 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 206 gtk::state $self, "game::window", undef, window_size => [600, 500];
209 207
208 $self->signal_connect (delete_event => sub { $self->part; 1 });
210 $self->{window}->signal_connect(delete_event => sub { 209 $self->signal_connect (destroy => sub {
211 $self->part; 210 $self->unlisten;
212 $self->destroy; 211 delete $self->{app}{game}{$self->{channel}};
213 1; 212 %{$_[0]} = ();
214 }); 213 });#d#
215 214
216 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 215 $self->add (my $hpane = new Gtk2::HPaned);
217 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 216 gtk::state $hpane, "game::hpane", undef, position => 500;
218 217
219 # LEFT PANE 218 # LEFT PANE
220 219
221 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 220 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
222 221
223 $self->{boardbox} = new Gtk2::VBox; 222 $self->{boardbox} = new Gtk2::VBox;
224 223
225 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 224 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
226 225
227 # challenge
228
229 $self->{challenge} = new challenge channel => $self->{channel};
230
231 # board box (aspect/canvas) 226 # board box (aspect/canvas)
232 227
233 $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);
234 236
235 { 237 {
236 $frame->add (my $vbox = new Gtk2::VBox); 238 $frame->add (my $vbox = new Gtk2::VBox);
237 $vbox->add ($self->{title} = new Gtk2::Label $title); 239 $vbox->add ($self->{title} = new Gtk2::Label $title);
238 240
… …
247 $scale->set_digits (0); 249 $scale->set_digits (0);
248 250
249 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 251 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
250 } 252 }
251 253
252 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
253
254 # RIGHT PANE
255
256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1);
258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
259
260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
261 $sw->set_policy("automatic", "always");
262
263 $sw->add(($self->{userlist} = new userlist)->widget);
264
265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
266
267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 254 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
255
268 $hbox->add (($self->{userpanel}[COLOUR_WHITE] = new game::userpanel colour => COLOUR_WHITE)->widget); 256 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
269 $hbox->add (($self->{userpanel}[COLOUR_BLACK] = new game::userpanel colour => COLOUR_BLACK)->widget); 257 for COLOUR_WHITE, COLOUR_BLACK;
270 258
271 $vbox->pack_start(($self->{chat} = new chat), 1, 1, 0); 259 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
272 260
261 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
262 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
263
273 $self->{chat}->signal_connect(command => sub { 264 $self->{chat}->signal_connect (command => sub {
274 my ($chat, $cmd, $arg) = @_; 265 my ($chat, $cmd, $arg) = @_;
275 if ($cmd eq "rsave") { 266 if ($cmd eq "rsave") {
276 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d# 267 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
277 } else { 268 } else {
278 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self); 269 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
279 } 270 }
280 }); 271 });
281 272
282 $self->event_update_game;
283 $self; 273 $self;
284} 274}
285 275
286sub event_update_users { 276sub event_update_users {
287 my ($self, $add, $update, $remove) = @_; 277 my ($self, $add, $update, $remove) = @_;
288 278
289 return unless $self->{userlist};
290
291 $self->{userlist}->update ($add, $update, $remove); 279# $self->{userlist}->update ($add, $update, $remove);
280
281 $self->{users_inlay}->refresh;
292 282
293 my %important; 283 my %important;
294 $important{$self->{user1}{name}}++; 284 $important{$self->{user1}{name}}++;
295 $important{$self->{user2}{name}}++; 285 $important{$self->{user2}{name}}++;
296 $important{$self->{user3}{name}}++; 286 $important{$self->{user3}{name}}++;
… …
309sub join { 299sub join {
310 my ($self) = @_; 300 my ($self) = @_;
311 return if $self->{joined}; 301 return if $self->{joined};
312 302
313 $self->SUPER::join; 303 $self->SUPER::join;
314
315 $self->{window}->show_all;
316}
317
318sub part {
319 my ($self) = @_;
320
321 $self->SUPER::part;
322 $self->destroy;
323} 304}
324 305
325sub update_board { 306sub update_board {
326 my ($self) = @_; 307 my ($self) = @_;
327 return unless $self->{path}; 308 return unless $self->{path};
… …
404 $self->{chat}->append_text ($text); 385 $self->{chat}->append_text ($text);
405} 386}
406 387
407sub event_join { 388sub event_join {
408 my ($self) = @_; 389 my ($self) = @_;
390
409 $self->SUPER::event_join; 391 $self->SUPER::event_join (@_);
392 $self->event_update_game;
393 $self->show_all;
410} 394}
411 395
412sub event_part { 396sub event_part {
413 my ($self) = @_; 397 my ($self) = @_;
398
414 $self->SUPER::event_part; 399 $self->SUPER::event_part;
415 $self->destroy; 400 $self->destroy;
416} 401}
417 402
418sub event_move { 403sub event_move {
… …
420 sound::play 1, $pass ? "pass" : "move"; 405 sound::play 1, $pass ? "pass" : "move";
421} 406}
422 407
423sub event_update_game { 408sub event_update_game {
424 my ($self) = @_; 409 my ($self) = @_;
410
425 $self->SUPER::event_update_game; 411 $self->SUPER::event_update_game;
426 412
427 return unless $self->{window}; 413 return unless $self->{joined};
428 414
429 my $title = defined $self->{channel} 415 my $title = defined $self->{channel}
430 ? $self->owner->as_string . " " . $self->opponent_string 416 ? $self->owner->as_string . " " . $self->opponent_string
431 : "Game Window"; 417 : "Game Window";
432 $self->{window}->set_title("KGS Game $title"); 418 $self->set_title("KGS Game $title");
433 $self->{title}->set_text ($title); 419 $self->{title}->set_text ($title);
434 420
435 $self->{user}[COLOUR_BLACK] = $self->{user1}; 421 $self->{user}[COLOUR_BLACK] = $self->{user1};
436 $self->{user}[COLOUR_WHITE] = $self->{user2}; 422 $self->{user}[COLOUR_WHITE] = $self->{user2};
437 423
438 # show board 424 # show board
425 if ($self->is_inprogress) {
426 if (!$self->{boardbox}->parent) {
427 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
428 $self->{left}->add ($self->{boardbox});
429 }
430 if (my $ch = delete $self->{challenge}) {
431 (delete $_->{inlay})->clear for values %$ch;
432 }
433 }
434
435 $self->{left}->show_all;
436
437 $self->{rules_inlay}->refresh;
439 438
440 if ($self->is_inprogress) {
441 $self->{left}->remove ($self->{challenge}->widget) if $self->{challenge} && $self->{boardbox}->parent;
442 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
443 } else {
444 $self->{left}->remove ($self->{boardbox}) if $self->{boardbox}->parent;
445 $self->{left}->add ($self->{challenge}->widget) unless $self->{challenge}->widget->parent;
446 }
447 $self->{left}->show_all;
448
449 # view text
450
451 eval { #d#
452 my @ga;
453 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
454 . " (" . (util::toxml $gameopt{$self->option}) . ")";
455 $ga[1] = "\nFlags:";
456 $ga[1] .= " started" if $self->is_inprogress;
457 $ga[1] .= " adjourned" if $self->is_adjourned;
458 $ga[1] .= " scored" if $self->is_scored;
459 $ga[1] .= " saved" if $self->is_saved;
460
461 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
462 if $self->{user3}->is_inprogress;
463
464 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
465 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
466 if $self->is_inprogress;
467
468 if ($self->is_inprogress) {
469 $ga[4] = "\nHandicap: " . $self->{handicap};
470 $ga[5] = "\nKomi: " . $self->{komi};
471 $ga[6] = "\nSize: " . $self->size_string;
472 }
473
474 if ($self->is_scored) {
475 $ga[7] = "\nResult: " . $self->score_string;
476 }
477
478 $text = "\n<infoblock><header>Game Update</header>";
479 for (0..7) {
480 if ($self->{gatext}[$_] ne $ga[$_]) {
481 $text .= $ga[$_];
482 }
483 }
484 $text .= "</infoblock>";
485
486 $self->{gatext} = \@ga;
487 };
488
489 $self->{chat}->append_text ($text);
490} 439}
491 440
492sub event_update_rules { 441sub draw_setup {
493 my ($self, $rules) = @_; 442 my ($self, $inlay) = @_;
494 443
495 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules) 444 my $rules = $self->{rules};
496 for COLOUR_BLACK, COLOUR_WHITE;
497 445
498 sound::play 3, "gamestart"; 446 my $text = "";
499 447
500 my $text = "\n<header>Game Rules</header>"; 448 ## Rules
501 449
502 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 450 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
503 451
504 $text .= "\nTime: "; 452 $text .= "\nTime: ";
505 453
… …
514 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 462 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
515 $text .= util::format_time $rules->{time}; 463 $text .= util::format_time $rules->{time};
516 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 464 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
517 } 465 }
518 466
467 ## Other state info
468
469 $text .= "\nType: " . util::toxml $self->type_char;
470 $text .= "\nFlags:";
471 $text .= " started" if $self->is_inprogress;
472 $text .= " adjourned" if $self->is_adjourned;
473 $text .= " scored" if $self->is_scored;
474 $text .= " saved" if $self->is_saved;
475
476 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
477 if $self->{user3}->is_valid;
478
479 if ($self->is_inprogress) {
480 $text .= "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
481 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
482 $text .= "\nHandicap: " . $self->{handicap};
483 $text .= "\nKomi: " . $self->{komi};
484 $text .= "\nSize: " . $self->size_string;
485 }
486
487 if ($self->is_scored) {
488 $text .= "\nResult: " . $self->score_string;
489 }
490
519 $self->{chat}->append_text ("<infoblock>$text</infoblock>"); 491 $inlay->append_text ("<infoblock>$text</infoblock>");
492
493}
494
495sub event_update_rules {
496 my ($self, $rules) = @_;
497
498 $self->{rules} = $rules;
499
500 if ($self->{user}) {
501 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
502 for COLOUR_BLACK, COLOUR_WHITE;
503 }
504
505 sound::play 3, "gamestart";
506
507 $self->{rules_inlay}->refresh;
520} 508}
521 509
522sub inject_resign_game { 510sub inject_resign_game {
523 my ($self, $msg) = @_; 511 my ($self, $msg) = @_;
524 512
… …
538 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 526 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
539 . "</infoblock>" 527 . "</infoblock>"
540 ); 528 );
541} 529}
542 530
531sub draw_challenge {
532 my ($self, $c) = @_;
533
534 my $inlay = $c->{inlay};
535 my $challenge = $c->{challenge};
536 my $rules = $challenge->{rules};
537
538 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
539 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
540
541 $inlay->append_text ("\n<challenge>Challenge to <user>" . $opponent->as_string . "</user></challenge>");
542 $inlay->append_text ("\nHandicap: $rules->{handicap}");
543
544#bless( (
545# gametype => 3,
546# user1 => bless( {
547# flags => 2633,
548# name => 'dorkusx'
549# }, 'KGS::User' ),
550# rules => bless( {
551# count => 5,
552# time => 900,
553# timesys => 2,
554# interval => 30,
555# komi => '6.5',
556# size => 19,
557# ruleset => 0,
558# handicap => 0
559# }, 'KGS::Rules' ),
560# user2 => bless( {
561# flags => 436220808,
562# name => 'Nerdamus'
563# }, 'KGS::User' )
564# ), 'KGS::Challenge' )
565}
566
567sub draw_users {
568 my ($self, $inlay) = @_;
569
570 for (sort keys %{$self->{users}}) {
571 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
572 }
573}
574
543sub event_challenge { 575sub event_challenge {
544 my ($self, $challenge) = @_; 576 my ($self, $challenge) = @_;
545 577
578 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
579 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
580
581 my $c = $self->{challenge}{$opponent->{name}} ||= {};
582
583 $c->{inlay} ||= $self->{chat}->new_inlay;
584 $c->{challenge} = $challenge;
585
586 $self->draw_challenge ($c);
587
546 use KGS::Listener::Debug; 588# require KGS::Listener::Debug;
547 $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); 589# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
548}
549
550sub destroy {
551 my ($self) = @_;
552
553 delete $self->{app}{gamelist}{game}{$self->{channel}};
554 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
555 for COLOUR_BLACK, COLOUR_WHITE;
556 $self->SUPER::destroy;
557} 590}
558 591
5591; 5921;
560 593

Diff Legend

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