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.67 by pcg, Sat Jun 28 16:46:51 2003 UTC vs.
Revision 1.86 by pcg, Fri May 21 03:18:15 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}
148 144
149sub configure { 145sub configure {
150 my ($self, $user, $rules) = @_; 146 my ($self, $app, $user, $rules) = @_;
151 147
152 if ($self->{name}->get_text ne $user->as_string) { 148 if ($self->{name}->get_text ne $user->as_string) {
153 $self->{name}->set_text ($user->as_string); 149 $self->{name}->set_text ($user->as_string);
154 150
155 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 151 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
156 $self->{imagebox}->add (gtk::image_from_data undef); 152 $self->{imagebox}->add (gtk::image_from_data undef);
157 $self->{imagebox}->show_all; 153 $self->{imagebox}->show_all;
158 154
159 if ($user->has_pic) { 155 if ($user->has_pic) {
160 # the big picture... 156 # the big picture...
161 appwin::userpic ($user->{name}, sub { 157 $app->userpic ($user->{name}, sub {
162 return unless $self->{imagebox}; 158 return unless $self->{imagebox};
159
163 if ($_[0]) { 160 if ($_[0]) {
164 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 161 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
165 $self->{imagebox}->add (gtk::image_from_data $_[0]); 162 $self->{imagebox}->add (gtk::image_from_data $_[0]);
166 $self->{imagebox}->show_all; 163 $self->{imagebox}->show_all;
167 } 164 }
… …
182 $self->{info}->set_text ("$captures pris."); 179 $self->{info}->set_text ("$captures pris.");
183} 180}
184 181
185package game; 182package game;
186 183
184use Scalar::Util qw(weaken);
185
187use KGS::Constants; 186use KGS::Constants;
188use KGS::Game::Board; 187use KGS::Game::Board;
189 188
189use Gtk2::GoBoard;
190
191use Glib::Object::Subclass
192 Gtk2::Window;
193
190use base KGS::Listener::Game; 194use base KGS::Listener::Game;
191use base KGS::Game; 195use base KGS::Game;
192 196
193use base gtk::widget;
194
195use POSIX qw(ceil); 197use POSIX qw(ceil);
196 198
197sub new { 199sub new {
198 my $self = shift; 200 my ($self, %arg) = @_;
199 $self = $self->SUPER::new(@_); 201 $self = $self->Glib::Object::new;
202 $self->{$_} = delete $arg{$_} for keys %arg;
200 203
201 $self->listen($self->{conn}); 204 $self->listen ($self->{conn});
202 205
203 $self->{window} = new Gtk2::Window 'toplevel';
204 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 206 gtk::state $self, "game::window", undef, window_size => [600, 500];
205 207
206 $self->{window}->signal_connect(delete_event => sub { 208 $self->signal_connect (delete_event => sub { $self->part; 1 });
207 $self->part; 209 $self->signal_connect (destroy => sub { %{$_[0]} = () });
208 $self->destroy;
209 1;
210 });
211 210
212 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 211 $self->add (my $hpane = new Gtk2::HPaned);
213 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 212 gtk::state $hpane, "game::hpane", undef, position => 500;
214 213
215 # LEFT PANE 214 # LEFT PANE
216 215
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 216 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
218 217
219 $self->{boardbox} = new Gtk2::VBox; 218 $self->{boardbox} = new Gtk2::VBox;
220 219
221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 220 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
222 221
223 # challenge
224
225 $self->{challenge} = new challenge channel => $self->{channel};
226
227 # board box (aspect/canvas) 222 # board box (aspect/canvas)
228 223
229 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 224 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
230 225
231 { 226 {
… …
247 242
248 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size}); 243 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
249 244
250 # RIGHT PANE 245 # RIGHT PANE
251 246
252 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); 247 $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1);
253 $self->{hpane}->set(position_set => 1); 248 $hpane->set (position_set => 1);
254 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 249 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
255 250
256 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 251 $self->{vpane}->add (my $sw = new Gtk2::ScrolledWindow);
257 $sw->set_policy("automatic", "always"); 252 $sw->set_policy ("automatic", "always");
258 253
259 $sw->add(($self->{userlist} = new userlist)->widget); 254 $sw->add ($self->{userlist} = new userlist);
260 255
261 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 256 $self->{vpane}->add (my $vbox = new Gtk2::VBox);
262 257
263 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 258 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
259
264 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 260 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
265 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 261 for COLOUR_WHITE, COLOUR_BLACK;
266 262
267 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 263 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
264 weaken $self->{chat};
268 265
269 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 266 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Rules", sub { $self->draw_rules (@_) }, 1);
267
270 $self->{entry}->signal_connect(activate => sub { 268 $self->{chat}->signal_connect (command => sub {
271 my $text = $self->{entry}->get_text; 269 my ($chat, $cmd, $arg) = @_;
272 $self->say($text) if $text =~ /\S/; 270 if ($cmd eq "rsave") {
273 $self->{entry}->set_text(""); 271 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
272 } else {
273 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
274 }
274 }); 275 });
275 276
276 $self->event_update_game;
277 $self; 277 $self;
278} 278}
279 279
280sub event_update_users { 280sub event_update_users {
281 my ($self, $add, $update, $remove) = @_; 281 my ($self, $add, $update, $remove) = @_;
282
283 return unless $self->{userlist};
282 284
283 $self->{userlist}->update ($add, $update, $remove); 285 $self->{userlist}->update ($add, $update, $remove);
284 286
285 my %important; 287 my %important;
286 $important{$self->{user1}{name}}++; 288 $important{$self->{user1}{name}}++;
287 $important{$self->{user2}{name}}++; 289 $important{$self->{user2}{name}}++;
288 $important{$self->{user3}{name}}++; 290 $important{$self->{user3}{name}}++;
289 291
290 if (my @users = grep $important{$_->{name}}, @$add) { 292 if (my @users = grep $important{$_->{name}}, @$add) {
291 $self->{text}->append_text ("\n<header>Joins:</header>"); 293 $self->{chat}->append_text ("\n<header>Joins:</header>");
292 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 294 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
293 } 295 }
294 if (my @users = grep $important{$_->{name}}, @$remove) { 296 if (my @users = grep $important{$_->{name}}, @$remove) {
295 $self->{text}->append_text ("\n<header>Parts:</header>"); 297 $self->{chat}->append_text ("\n<header>Parts:</header>");
296 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 298 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
297 } 299 }
298 300
299} 301}
300 302
301sub join { 303sub join {
302 my ($self) = @_; 304 my ($self) = @_;
303 return if $self->{joined}; 305 return if $self->{joined};
304 306
305 $self->SUPER::join; 307 $self->SUPER::join;
306 308
307 $self->{window}->show_all; 309 $self->show_all;
308}
309
310sub part {
311 my ($self) = @_;
312
313 $self->SUPER::part;
314 $self->destroy;
315} 310}
316 311
317sub update_board { 312sub update_board {
318 my ($self) = @_; 313 my ($self) = @_;
319 return unless $self->{path}; 314 return unless $self->{path};
… …
325 $self->{board_label}->set_text ("Move " . ($move - 1)); 320 $self->{board_label}->set_text ("Move " . ($move - 1));
326 321
327 $self->{cur_board} = new KGS::Game::Board $self->{size}; 322 $self->{cur_board} = new KGS::Game::Board $self->{size};
328 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 323 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
329 324
330 for my $colour (WHITE, BLACK) { 325 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
331 $self->{userpanel}[$colour]->set_state ( 326 $self->{userpanel}[$colour]->set_state (
332 $self->{cur_board}{captures}[$colour], 327 $self->{cur_board}{captures}[$colour],
333 $self->{cur_board}{timer}[$colour], 328 $self->{cur_board}{timer}[$colour],
334 ($running && $self->{lastmove_colour} == !$colour) 329 ($running && $self->{lastmove_colour} == !$colour)
335 ? $self->{lastmove_time} : 0 330 ? $self->{lastmove_time} : 0
… …
391 }sgexi; 386 }sgexi;
392 387
393 $text .= $_; 388 $text .= $_;
394 } 389 }
395 390
396 $self->{text}->append_text ($text); 391 $self->{chat}->append_text ($text);
397} 392}
398 393
399sub event_join { 394sub event_join {
400 my ($self) = @_; 395 my ($self) = @_;
396
401 $self->SUPER::event_join; 397 $self->SUPER::event_join (@_);
398 $self->event_update_game;
402} 399}
403 400
404sub event_part { 401sub event_part {
405 my ($self) = @_; 402 my ($self) = @_;
403
406 $self->SUPER::event_part; 404 $self->SUPER::event_part;
407 $self->destroy; 405 $self->destroy;
408} 406}
409 407
410sub event_move { 408sub event_move {
… …
414 412
415sub event_update_game { 413sub event_update_game {
416 my ($self) = @_; 414 my ($self) = @_;
417 $self->SUPER::event_update_game; 415 $self->SUPER::event_update_game;
418 416
417 return unless $self->{joined};
418
419 my $title = defined $self->{channel} 419 my $title = defined $self->{channel}
420 ? $self->owner->as_string . " " . $self->opponent_string 420 ? $self->owner->as_string . " " . $self->opponent_string
421 : "Game Window"; 421 : "Game Window";
422 $self->{window}->set_title("KGS Game $title"); 422 $self->set_title("KGS Game $title");
423 $self->{title}->set_text ($title); 423 $self->{title}->set_text ($title);
424 424
425 $self->{user}[BLACK] = $self->{user1}; 425 $self->{user}[COLOUR_BLACK] = $self->{user1};
426 $self->{user}[WHITE] = $self->{user2}; 426 $self->{user}[COLOUR_WHITE] = $self->{user2};
427 427
428 # show board 428 # show board
429 if ($self->is_inprogress) {
430 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
431 if (my $ch = delete $self->{challenge}) {
432 (delete $_->{inlay})->clear for values %$ch;
433 }
429 434 }
430 $self->{left}->remove ($_) for $self->{left}->get_children; 435
431 if ($self->is_valid) {
432 $self->{left}->add ($self->{boardbox});
433 (delete $self->{challenge})->destroy if $self->{challenge};
434 } else {
435 $self->{left}->add ($self->{challenge}->widget);
436 }
437 $self->{left}->show_all; 436 $self->{left}->show_all;
438 437
439 # view text 438 # view text
440 439
441 eval { #d# 440 eval { #d#
442 my @ga; 441 my @ga;
443 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) 442 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
444 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 443 . " (" . (util::toxml $gameopt{$self->option}) . ")";
445 $ga[1] = "\nFlags:"; 444 $ga[1] = "\nFlags:";
446 $ga[1] .= " valid" if $self->is_valid; 445 $ga[1] .= " started" if $self->is_inprogress;
447 $ga[1] .= " adjourned" if $self->is_adjourned; 446 $ga[1] .= " adjourned" if $self->is_adjourned;
448 $ga[1] .= " scored" if $self->is_scored; 447 $ga[1] .= " scored" if $self->is_scored;
449 $ga[1] .= " saved" if $self->is_saved; 448 $ga[1] .= " saved" if $self->is_saved;
450 449
451 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 450 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
451 if $self->{user3}->is_inprogress;
452 452
453 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 453 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
454 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 454 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
455 if $self->is_valid; 455 if $self->is_inprogress;
456 456
457 if ($self->is_valid) { 457 if ($self->is_inprogress) {
458 $ga[4] = "\nHandicap: " . $self->{handicap}; 458 $ga[4] = "\nHandicap: " . $self->{handicap};
459 $ga[5] = "\nKomi: " . $self->{komi}; 459 $ga[5] = "\nKomi: " . $self->{komi};
460 $ga[6] = "\nSize: " . $self->size_string; 460 $ga[6] = "\nSize: " . $self->size_string;
461 } 461 }
462 462
… …
473 $text .= "</infoblock>"; 473 $text .= "</infoblock>";
474 474
475 $self->{gatext} = \@ga; 475 $self->{gatext} = \@ga;
476 }; 476 };
477 477
478 $self->{text}->append_text ($text); 478 $self->{chat}->append_text ($text);
479} 479}
480 480
481sub event_update_rules { 481sub draw_rules {
482 my ($self, $rules) = @_; 482 my ($self, $inlay) = @_;
483 483
484 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) 484 my $rules = $self->{rules};
485 for BLACK, WHITE;
486 485
487 sound::play 3, "gamestart"; 486 my $text = "";
488
489 my $text = "\n<header>Game Rules</header>";
490 487
491 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 488 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
492 489
493 $text .= "\nTime: "; 490 $text .= "\nTime: ";
494 491
… …
496 $text .= "UNLIMITED"; 493 $text .= "UNLIMITED";
497 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 494 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
498 $text .= util::format_time $rules->{time}; 495 $text .= util::format_time $rules->{time};
499 $text .= " ABS"; 496 $text .= " ABS";
500 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 497 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
501 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 498 $text .= util::format_time $rules->{time};
502 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; 499 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
503 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 500 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
504 $text .= util::format_time $rules->{time}; 501 $text .= util::format_time $rules->{time};
505 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 502 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
506 } 503 }
507 504
505 $inlay->clear;
508 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 506 $inlay->append_text ("<infoblock>$text</infoblock>");
507}
508
509sub event_update_rules {
510 my ($self, $rules) = @_;
511
512 $self->{rules} = $rules;
513
514 if ($self->{user}) {
515 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
516 for COLOUR_BLACK, COLOUR_WHITE;
517 }
518
519 sound::play 3, "gamestart";
520
521 $self->draw_rules ($self->{rules_inlay});
509} 522}
510 523
511sub inject_resign_game { 524sub inject_resign_game {
512 my ($self, $msg) = @_; 525 my ($self, $msg) = @_;
513 526
514 sound::play 3, "resign"; 527 sound::play 3, "resign";
515 528
516 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 529 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
517 . "\n<user>" 530 . "\n<user>"
518 . (util::toxml $self->{user}[$msg->{player}]->as_string) 531 . (util::toxml $self->{user}[$msg->{player}]->as_string)
519 . "</user> resigned.</infoblock>"); 532 . "</user> resigned.</infoblock>");
520} 533}
521 534
522sub inject_final_result { 535sub inject_final_result {
523 my ($self, $msg) = @_; 536 my ($self, $msg) = @_;
524 537
525 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 538 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
526 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 539 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
527 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 540 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
528 . "</infoblock>" 541 . "</infoblock>"
529 ); 542 );
530} 543}
531 544
532sub destroy { 545sub draw_challenge {
533 my ($self) = @_; 546 my ($self, $c) = @_;
534 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 547
535 for BLACK, WHITE; 548 my $inlay = $c->{inlay};
536 $self->SUPER::destroy; 549 my $challenge = $c->{challenge};
537 delete $appwin::gamelist->{game}{$self->{channel}}; 550 my $rules = $challenge->{rules};
551
552 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
553 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
554
555 $inlay->clear;
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 event_challenge {
583 my ($self, $challenge) = @_;
584
585 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
586 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
587
588 my $c = $self->{challenge}{$opponent->{name}} ||= {};
589
590 $c->{inlay} ||= $self->{chat}->new_inlay;
591 $c->{challenge} = $challenge;
592
593 $self->draw_challenge ($c);
594
595# require KGS::Listener::Debug;
596# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
538} 597}
539 598
5401; 5991;
541 600

Diff Legend

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