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.73 by pcg, Fri Jul 25 17:35:20 2003 UTC vs.
Revision 1.91 by pcg, Sun May 23 02:23:54 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
… …
55 my $time = int (($_[0] - 1) % $interval + 1); 55 my $time = int (($_[0] - 1) % $interval + 1);
56 56
57 sprintf "%s/%d =%d", 57 sprintf "%s/%d =%d",
58 util::format_time $time, 58 util::format_time $time,
59 $self->{moves}, 59 $self->{moves},
60 $self->{moves} > 1
60 $time / ($self->{moves} || 1); 61 ? $time / $self->{moves}
61 62 : $interval;
62 } 63 }
63 }; 64 };
64 65
65 } else { 66 } else {
66 # none, or unknown 67 # none, or unknown
… …
74 my $timer = $self->{time} + $self->{start} - $timestamp; 75 my $timer = $self->{time} + $self->{start} - $timestamp;
75 76
76 # 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,
77 # and this gives smoother timers ;) 78 # and this gives smoother timers ;)
78 my @format = $self->{format}->(int ($timer + 0.4)); 79 my @format = $self->{format}->(int ($timer + 0.4));
79 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); 80 $self->set_text ($self->{format}->(int ($timer + 0.4)));
80 81
81 $timer - int $timer; 82 $timer - int $timer;
82} 83}
83 84
84sub set_time { 85sub set_time {
… …
117 my ($self) = @_; 118 my ($self) = @_;
118 119
119 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 120 remove Glib::Source delete $self->{timeout} if $self->{timeout};
120} 121}
121 122
122sub destroy {
123 my ($self) = @_;
124 $self->stop;
125 $self->SUPER::destroy;
126}
127
128package game::userpanel; 123package game::userpanel;
129 124
130use 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 ];
131 130
132sub new { 131sub INIT_INSTANCE {
133 my $class = shift; 132 my ($self) = @_;
134 my $self = $class->SUPER::new(@_);
135 133
136 $self->{widget} = new Gtk2::HBox;
137
138 $self->{widget}->add (my $vbox = new Gtk2::VBox); 134 $self->add (my $vbox = new Gtk2::VBox);
139 135
140 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 136 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
141 $vbox->add ($self->{info} = new Gtk2::Label ""); 137 $vbox->add ($self->{info} = new Gtk2::Label "");
142 $vbox->add (($self->{clock} = new game::goclock)->widget); 138 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock};
143 139
144 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 140 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
145 141
146 $self; 142 $self;
147} 143}
… …
183 $self->{info}->set_text ("$captures pris."); 179 $self->{info}->set_text ("$captures pris.");
184} 180}
185 181
186package game; 182package game;
187 183
184use Scalar::Util qw(weaken);
185
188use KGS::Constants; 186use KGS::Constants;
189use KGS::Game::Board; 187use KGS::Game::Board;
190 188
189use Gtk2::GoBoard;
190
191use Glib::Object::Subclass
192 Gtk2::Window;
193
191use base KGS::Listener::Game; 194use base KGS::Listener::Game;
192use base KGS::Game; 195use base KGS::Game;
193 196
194use base gtk::widget;
195
196use POSIX qw(ceil); 197use POSIX qw(ceil);
197 198
198sub new { 199sub new {
199 my $self = shift; 200 my ($self, %arg) = @_;
200 $self = $self->SUPER::new(@_); 201 $self = $self->Glib::Object::new;
202 $self->{$_} = delete $arg{$_} for keys %arg;
201 203
202 $self->listen($self->{conn}); 204 $self->listen ($self->{conn});
203 205
204 $self->{window} = new Gtk2::Window 'toplevel';
205 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 206 gtk::state $self, "game::window", undef, window_size => [600, 500];
206 207
208 $self->signal_connect (delete_event => sub { $self->part; 1 });
207 $self->{window}->signal_connect(delete_event => sub { 209 $self->signal_connect (destroy => sub {
208 $self->part; 210 $self->unlisten;
209 $self->destroy; 211 delete $self->{app}{game}{$self->{channel}};
210 1; 212 %{$_[0]} = ();
211 }); 213 });#d#
212 214
213 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 215 $self->add (my $hpane = new Gtk2::HPaned);
214 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 216 gtk::state $hpane, "game::hpane", undef, position => 500;
215 217
216 # LEFT PANE 218 # LEFT PANE
217 219
218 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 220 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
219 221
220 $self->{boardbox} = new Gtk2::VBox; 222 $self->{boardbox} = new Gtk2::VBox;
221 223
222 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 224 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
223 225
224 # challenge
225
226 $self->{challenge} = new challenge channel => $self->{channel};
227
228 # board box (aspect/canvas) 226 # board box (aspect/canvas)
229 227
230 $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);
231 236
232 { 237 {
233 $frame->add (my $vbox = new Gtk2::VBox); 238 $frame->add (my $vbox = new Gtk2::VBox);
234 $vbox->add ($self->{title} = new Gtk2::Label $title); 239 $vbox->add ($self->{title} = new Gtk2::Label $title);
235 240
… …
246 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 251 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
247 } 252 }
248 253
249 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size}); 254 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
250 255
251 # RIGHT PANE
252
253 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
254 $self->{hpane}->set(position_set => 1);
255 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
256
257 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
258 $sw->set_policy("automatic", "always");
259
260 $sw->add(($self->{userlist} = new userlist)->widget);
261
262 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
263
264 $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);
257
265 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 258 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
266 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 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 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);
265
270 $self->{chat}->signal_connect(command => sub { 266 $self->{chat}->signal_connect (command => sub {
271 my ($chat, $cmd, $arg) = @_; 267 my ($chat, $cmd, $arg) = @_;
272 if ($cmd eq "rsave") { 268 if ($cmd eq "rsave") {
273 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#
274 } else { 270 } else {
275 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self); 271 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
276 } 272 }
277 }); 273 });
278 274
279 $self->event_update_game;
280 $self; 275 $self;
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->{window}->show_all;
313}
314
315sub part {
316 my ($self) = @_;
317
318 $self->SUPER::part;
319 $self->destroy;
320} 306}
321 307
322sub update_board { 308sub update_board {
323 my ($self) = @_; 309 my ($self) = @_;
324 return unless $self->{path}; 310 return unless $self->{path};
… …
330 $self->{board_label}->set_text ("Move " . ($move - 1)); 316 $self->{board_label}->set_text ("Move " . ($move - 1));
331 317
332 $self->{cur_board} = new KGS::Game::Board $self->{size}; 318 $self->{cur_board} = new KGS::Game::Board $self->{size};
333 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 319 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
334 320
335 for my $colour (WHITE, BLACK) { 321 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
336 $self->{userpanel}[$colour]->set_state ( 322 $self->{userpanel}[$colour]->set_state (
337 $self->{cur_board}{captures}[$colour], 323 $self->{cur_board}{captures}[$colour],
338 $self->{cur_board}{timer}[$colour], 324 $self->{cur_board}{timer}[$colour],
339 ($running && $self->{lastmove_colour} == !$colour) 325 ($running && $self->{lastmove_colour} == !$colour)
340 ? $self->{lastmove_time} : 0 326 ? $self->{lastmove_time} : 0
… …
401 $self->{chat}->append_text ($text); 387 $self->{chat}->append_text ($text);
402} 388}
403 389
404sub event_join { 390sub event_join {
405 my ($self) = @_; 391 my ($self) = @_;
392
406 $self->SUPER::event_join; 393 $self->SUPER::event_join (@_);
394 $self->event_update_game;
395 $self->show_all;
407} 396}
408 397
409sub event_part { 398sub event_part {
410 my ($self) = @_; 399 my ($self) = @_;
400
411 $self->SUPER::event_part; 401 $self->SUPER::event_part;
412 $self->destroy; 402 $self->destroy;
413} 403}
414 404
415sub event_move { 405sub event_move {
… …
419 409
420sub event_update_game { 410sub event_update_game {
421 my ($self) = @_; 411 my ($self) = @_;
422 $self->SUPER::event_update_game; 412 $self->SUPER::event_update_game;
423 413
424 return unless $self->{window}; 414 return unless $self->{joined};
425 415
426 my $title = defined $self->{channel} 416 my $title = defined $self->{channel}
427 ? $self->owner->as_string . " " . $self->opponent_string 417 ? $self->owner->as_string . " " . $self->opponent_string
428 : "Game Window"; 418 : "Game Window";
429 $self->{window}->set_title("KGS Game $title"); 419 $self->set_title("KGS Game $title");
430 $self->{title}->set_text ($title); 420 $self->{title}->set_text ($title);
431 421
432 $self->{user}[BLACK] = $self->{user1}; 422 $self->{user}[COLOUR_BLACK] = $self->{user1};
433 $self->{user}[WHITE] = $self->{user2}; 423 $self->{user}[COLOUR_WHITE] = $self->{user2};
434 424
435 # show board 425 # show board
426 if ($self->is_inprogress) {
427 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
428 if (my $ch = delete $self->{challenge}) {
429 (delete $_->{inlay})->clear for values %$ch;
430 }
436 431 }
437 $self->{left}->remove ($_) for $self->{left}->get_children; 432
438 if ($self->is_valid) {
439 $self->{left}->add ($self->{boardbox});
440 (delete $self->{challenge})->destroy if $self->{challenge};
441 } else {
442 $self->{left}->add ($self->{challenge}->widget);
443 }
444 $self->{left}->show_all; 433 $self->{left}->show_all;
445 434
446 # view text 435 # view text
447 436
448 eval { #d# 437 eval { #d#
449 my @ga; 438 my @ga;
450 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) 439 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
451 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 440 . " (" . (util::toxml $gameopt{$self->option}) . ")";
452 $ga[1] = "\nFlags:"; 441 $ga[1] = "\nFlags:";
453 $ga[1] .= " valid" if $self->is_valid; 442 $ga[1] .= " started" if $self->is_inprogress;
454 $ga[1] .= " adjourned" if $self->is_adjourned; 443 $ga[1] .= " adjourned" if $self->is_adjourned;
455 $ga[1] .= " scored" if $self->is_scored; 444 $ga[1] .= " scored" if $self->is_scored;
456 $ga[1] .= " saved" if $self->is_saved; 445 $ga[1] .= " saved" if $self->is_saved;
457 446
458 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 447 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
448 if $self->{user3}->is_inprogress;
459 449
460 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 450 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
461 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 451 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
462 if $self->is_valid; 452 if $self->is_inprogress;
463 453
464 if ($self->is_valid) { 454 if ($self->is_inprogress) {
465 $ga[4] = "\nHandicap: " . $self->{handicap}; 455 $ga[4] = "\nHandicap: " . $self->{handicap};
466 $ga[5] = "\nKomi: " . $self->{komi}; 456 $ga[5] = "\nKomi: " . $self->{komi};
467 $ga[6] = "\nSize: " . $self->size_string; 457 $ga[6] = "\nSize: " . $self->size_string;
468 } 458 }
469 459
… …
483 }; 473 };
484 474
485 $self->{chat}->append_text ($text); 475 $self->{chat}->append_text ($text);
486} 476}
487 477
488sub event_update_rules { 478sub draw_rules {
489 my ($self, $rules) = @_; 479 my ($self, $inlay) = @_;
490 480
491 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules) 481 my $rules = $self->{rules};
492 for BLACK, WHITE;
493 482
494 sound::play 3, "gamestart"; 483 my $text = "";
495
496 my $text = "\n<header>Game Rules</header>";
497 484
498 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 485 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
499 486
500 $text .= "\nTime: "; 487 $text .= "\nTime: ";
501 488
… …
503 $text .= "UNLIMITED"; 490 $text .= "UNLIMITED";
504 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 491 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
505 $text .= util::format_time $rules->{time}; 492 $text .= util::format_time $rules->{time};
506 $text .= " ABS"; 493 $text .= " ABS";
507 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 494 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
508 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 495 $text .= util::format_time $rules->{time};
509 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; 496 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
510 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 497 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
511 $text .= util::format_time $rules->{time}; 498 $text .= util::format_time $rules->{time};
512 $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};
513 } 500 }
514 501
515 $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;
516} 518}
517 519
518sub inject_resign_game { 520sub inject_resign_game {
519 my ($self, $msg) = @_; 521 my ($self, $msg) = @_;
520 522
… …
534 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 536 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
535 . "</infoblock>" 537 . "</infoblock>"
536 ); 538 );
537} 539}
538 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
539sub event_challenge { 585sub event_challenge {
540 my ($self, $challenge) = @_; 586 my ($self, $challenge) = @_;
541 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
542 use KGS::Listener::Debug; 598# require KGS::Listener::Debug;
543 $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); 599# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
544}
545
546sub destroy {
547 my ($self) = @_;
548
549 delete $self->{app}{gamelist}{game}{$self->{channel}};
550 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
551 for BLACK, WHITE;
552 $self->SUPER::destroy;
553} 600}
554 601
5551; 6021;
556 603

Diff Legend

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