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.64 by pcg, Sun Jun 22 20:47:12 2003 UTC vs.
Revision 1.87 by pcg, Fri May 21 15:32:02 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
208 $self->signal_connect (delete_event => sub { $self->part; 1 });
206 $self->{window}->signal_connect(delete_event => sub { 209 $self->signal_connect (destroy => sub {
207 $self->part; 210 $self->unlisten;
208 $self->destroy; 211 delete $self->{app}{game}{$self->{channel}};
209 1; 212 %{$_[0]} = ();
210 }); 213 });#d#
211 214
212 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 215 $self->add (my $hpane = new Gtk2::HPaned);
213 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 216 gtk::state $hpane, "game::hpane", undef, position => 500;
214 217
215 # LEFT PANE 218 # LEFT PANE
216 219
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 220 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
218 221
219 $self->{boardbox} = new Gtk2::VBox; 222 $self->{boardbox} = new Gtk2::VBox;
220 223
221 $self->{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 {
232 $frame->add(my $vbox = new Gtk2::VBox); 231 $frame->add (my $vbox = new Gtk2::VBox);
233 $vbox->add($self->{title} = new Gtk2::Label $title); 232 $vbox->add ($self->{title} = new Gtk2::Label $title);
233
234 $vbox->add (my $hbox = new Gtk2::HBox);
235
236 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
234 237
235 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 238 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
236 239
237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 240 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
238 $scale->set_draw_value (0); 241 $scale->set_draw_value (0);
239 $scale->set_digits (0); 242 $scale->set_digits (0);
240 243
241 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 244 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
242 } 245 }
243 246
244 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
245 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
246 $self->{board_label} = $aspect_frame->get_label_widget;
247
248 $aspect_frame->add($self->{board} = new board size => $self->{size}); 247 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
249 248
250 # RIGHT PANE 249 # RIGHT PANE
251 250
252 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); 251 $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1);
253 $self->{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 257
259 $sw->add(($self->{userlist} = new userlist)->widget); 258 $sw->add ($self->{userlist} = new userlist);
260 259
261 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 260 $self->{vpane}->add (my $vbox = new Gtk2::VBox);
262 261
263 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 262 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
263
264 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 264 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
265 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 265 for COLOUR_WHITE, COLOUR_BLACK;
266 266
267 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 267 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
268 268
269 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 269 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Rules", sub { $self->draw_rules (@_) }, 1);
270
270 $self->{entry}->signal_connect(activate => sub { 271 $self->{chat}->signal_connect (command => sub {
271 my $text = $self->{entry}->get_text; 272 my ($chat, $cmd, $arg) = @_;
272 $self->say($text) if $text =~ /\S/; 273 if ($cmd eq "rsave") {
273 $self->{entry}->set_text(""); 274 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
275 } else {
276 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
277 }
274 }); 278 });
275 279
276 $self->event_update_game;
277 $self; 280 $self;
278} 281}
279 282
280sub event_update_users { 283sub event_update_users {
281 my ($self, $add, $update, $remove) = @_; 284 my ($self, $add, $update, $remove) = @_;
285
286 return unless $self->{userlist};
282 287
283 $self->{userlist}->update ($add, $update, $remove); 288 $self->{userlist}->update ($add, $update, $remove);
284 289
285 my %important; 290 my %important;
286 $important{$self->{user1}{name}}++; 291 $important{$self->{user1}{name}}++;
287 $important{$self->{user2}{name}}++; 292 $important{$self->{user2}{name}}++;
288 $important{$self->{user3}{name}}++; 293 $important{$self->{user3}{name}}++;
289 294
290 if (my @users = grep $important{$_->{name}}, @$add) { 295 if (my @users = grep $important{$_->{name}}, @$add) {
291 $self->{text}->append_text ("\n<header>Joins:</header>"); 296 $self->{chat}->append_text ("\n<header>Joins:</header>");
292 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 297 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
293 } 298 }
294 if (my @users = grep $important{$_->{name}}, @$remove) { 299 if (my @users = grep $important{$_->{name}}, @$remove) {
295 $self->{text}->append_text ("\n<header>Parts:</header>"); 300 $self->{chat}->append_text ("\n<header>Parts:</header>");
296 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 301 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
297 } 302 }
298 303
299} 304}
300 305
301sub join { 306sub join {
302 my ($self) = @_; 307 my ($self) = @_;
303 return if $self->{joined}; 308 return if $self->{joined};
304 309
305 $self->SUPER::join; 310 $self->SUPER::join;
306
307 $self->{window}->show_all;
308}
309
310sub part {
311 my ($self) = @_;
312
313 $self->SUPER::part;
314 $self->destroy;
315} 311}
316 312
317sub update_board { 313sub update_board {
318 my ($self) = @_; 314 my ($self) = @_;
319 return unless $self->{path}; 315 return unless $self->{path};
… …
325 $self->{board_label}->set_text ("Move " . ($move - 1)); 321 $self->{board_label}->set_text ("Move " . ($move - 1));
326 322
327 $self->{cur_board} = new KGS::Game::Board $self->{size}; 323 $self->{cur_board} = new KGS::Game::Board $self->{size};
328 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 324 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
329 325
330 for my $colour (WHITE, BLACK) { 326 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
331 $self->{userpanel}[$colour]->set_state ( 327 $self->{userpanel}[$colour]->set_state (
332 $self->{cur_board}{captures}[$colour], 328 $self->{cur_board}{captures}[$colour],
333 $self->{cur_board}{timer}[$colour], 329 $self->{cur_board}{timer}[$colour],
334 ($running && $self->{lastmove_colour} == !$colour) 330 ($running && $self->{lastmove_colour} == !$colour)
335 ? $self->{lastmove_time} : 0 331 ? $self->{lastmove_time} : 0
… …
391 }sgexi; 387 }sgexi;
392 388
393 $text .= $_; 389 $text .= $_;
394 } 390 }
395 391
396 $self->{text}->append_text ($text); 392 $self->{chat}->append_text ($text);
397} 393}
398 394
399sub event_join { 395sub event_join {
400 my ($self) = @_; 396 my ($self) = @_;
397
401 $self->SUPER::event_join; 398 $self->SUPER::event_join (@_);
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) = @_;
405
406 $self->SUPER::event_part; 406 $self->SUPER::event_part;
407 $self->destroy; 407 $self->destroy;
408} 408}
409 409
410sub event_move { 410sub event_move {
… …
414 414
415sub event_update_game { 415sub event_update_game {
416 my ($self) = @_; 416 my ($self) = @_;
417 $self->SUPER::event_update_game; 417 $self->SUPER::event_update_game;
418 418
419 my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window"; 419 return unless $self->{joined};
420
421 my $title = defined $self->{channel}
422 ? $self->owner->as_string . " " . $self->opponent_string
423 : "Game Window";
420 $self->{window}->set_title("KGS Game $title"); 424 $self->set_title("KGS Game $title");
421 $self->{title}->set_text ($title); 425 $self->{title}->set_text ($title);
422 426
423 $self->{user}[BLACK] = $self->{user1}; 427 $self->{user}[COLOUR_BLACK] = $self->{user1};
424 $self->{user}[WHITE] = $self->{user2}; 428 $self->{user}[COLOUR_WHITE] = $self->{user2};
425 429
426 # show board 430 # show board
431 if ($self->is_inprogress) {
432 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
433 if (my $ch = delete $self->{challenge}) {
434 (delete $_->{inlay})->clear for values %$ch;
435 }
427 436 }
428 $self->{left}->remove ($_) for $self->{left}->get_children; 437
429 if ($self->is_valid) {
430 $self->{left}->add ($self->{boardbox});
431 (delete $self->{challenge})->destroy if $self->{challenge};
432 } else {
433 $self->{left}->add ($self->{challenge}->widget);
434 }
435 $self->{left}->show_all; 438 $self->{left}->show_all;
436 439
437 # view text 440 # view text
438 441
439 eval { #d# 442 eval { #d#
440 my @ga; 443 my @ga;
441 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) 444 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
442 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 445 . " (" . (util::toxml $gameopt{$self->option}) . ")";
443 $ga[1] = "\nFlags:"; 446 $ga[1] = "\nFlags:";
444 $ga[1] .= " valid" if $self->is_valid; 447 $ga[1] .= " started" if $self->is_inprogress;
445 $ga[1] .= " adjourned" if $self->is_adjourned; 448 $ga[1] .= " adjourned" if $self->is_adjourned;
446 $ga[1] .= " scored" if $self->is_scored; 449 $ga[1] .= " scored" if $self->is_scored;
447 $ga[1] .= " saved" if $self->is_saved; 450 $ga[1] .= " saved" if $self->is_saved;
448 451
449 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 452 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
453 if $self->{user3}->is_inprogress;
450 454
451 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 455 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
452 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 456 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
453 if $self->is_valid; 457 if $self->is_inprogress;
454 458
455 if ($self->is_valid) { 459 if ($self->is_inprogress) {
456 $ga[4] = "\nHandicap: " . $self->{handicap}; 460 $ga[4] = "\nHandicap: " . $self->{handicap};
457 $ga[5] = "\nKomi: " . $self->{komi}; 461 $ga[5] = "\nKomi: " . $self->{komi};
458 $ga[6] = "\nSize: " . $self->size_string; 462 $ga[6] = "\nSize: " . $self->size_string;
459 } 463 }
460 464
… …
471 $text .= "</infoblock>"; 475 $text .= "</infoblock>";
472 476
473 $self->{gatext} = \@ga; 477 $self->{gatext} = \@ga;
474 }; 478 };
475 479
476 $self->{text}->append_text ($text); 480 $self->{chat}->append_text ($text);
477} 481}
478 482
479sub event_update_rules { 483sub draw_rules {
480 my ($self, $rules) = @_; 484 my ($self, $inlay) = @_;
481 485
482 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) 486 my $rules = $self->{rules};
483 for BLACK, WHITE;
484 487
485 sound::play 3, "gamestart"; 488 my $text = "";
486
487 my $text = "\n<header>Game Rules</header>";
488 489
489 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 490 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
490 491
491 $text .= "\nTime: "; 492 $text .= "\nTime: ";
492 493
… …
494 $text .= "UNLIMITED"; 495 $text .= "UNLIMITED";
495 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 496 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
496 $text .= util::format_time $rules->{time}; 497 $text .= util::format_time $rules->{time};
497 $text .= " ABS"; 498 $text .= " ABS";
498 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 499 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
499 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 500 $text .= util::format_time $rules->{time};
500 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; 501 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
501 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 502 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
502 $text .= util::format_time $rules->{time}; 503 $text .= util::format_time $rules->{time};
503 $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};
504 } 505 }
505 506
507 $inlay->clear;
506 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 508 $inlay->append_text ("<infoblock>$text</infoblock>");
509}
510
511sub event_update_rules {
512 my ($self, $rules) = @_;
513
514 $self->{rules} = $rules;
515
516 if ($self->{user}) {
517 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
518 for COLOUR_BLACK, COLOUR_WHITE;
519 }
520
521 sound::play 3, "gamestart";
522
523 $self->draw_rules ($self->{rules_inlay});
507} 524}
508 525
509sub inject_resign_game { 526sub inject_resign_game {
510 my ($self, $msg) = @_; 527 my ($self, $msg) = @_;
511 528
512 sound::play 3, "resign"; 529 sound::play 3, "resign";
513 530
514 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 531 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
515 . "\n<user>" 532 . "\n<user>"
516 . (util::toxml $self->{user}[$msg->{player}]->as_string) 533 . (util::toxml $self->{user}[$msg->{player}]->as_string)
517 . "</user> resigned.</infoblock>"); 534 . "</user> resigned.</infoblock>");
518} 535}
519 536
520sub inject_final_result { 537sub inject_final_result {
521 my ($self, $msg) = @_; 538 my ($self, $msg) = @_;
522 539
523 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 540 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
524 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 541 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
525 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 542 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
526 . "</infoblock>" 543 . "</infoblock>"
527 ); 544 );
528} 545}
529 546
530sub destroy { 547sub draw_challenge {
531 my ($self) = @_; 548 my ($self, $c) = @_;
532 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 549
533 for BLACK, WHITE; 550 my $inlay = $c->{inlay};
534 $self->SUPER::destroy; 551 my $challenge = $c->{challenge};
535 delete $appwin::gamelist->{game}{$self->{channel}}; 552 my $rules = $challenge->{rules};
553
554 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
555 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
556
557 $inlay->clear;
558 $inlay->append_text ("\n<challenge>Challenge to <user>" . $opponent->as_string . "</user></challenge>");
559 $inlay->append_text ("\nHandicap: $rules->{handicap}");
560
561#bless( (
562# gametype => 3,
563# user1 => bless( {
564# flags => 2633,
565# name => 'dorkusx'
566# }, 'KGS::User' ),
567# rules => bless( {
568# count => 5,
569# time => 900,
570# timesys => 2,
571# interval => 30,
572# komi => '6.5',
573# size => 19,
574# ruleset => 0,
575# handicap => 0
576# }, 'KGS::Rules' ),
577# user2 => bless( {
578# flags => 436220808,
579# name => 'Nerdamus'
580# }, 'KGS::User' )
581# ), 'KGS::Challenge' )
582}
583
584sub event_challenge {
585 my ($self, $challenge) = @_;
586
587 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
588 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
589
590 my $c = $self->{challenge}{$opponent->{name}} ||= {};
591
592 $c->{inlay} ||= $self->{chat}->new_inlay;
593 $c->{challenge} = $challenge;
594
595 $self->draw_challenge ($c);
596
597# require KGS::Listener::Debug;
598# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
536} 599}
537 600
5381; 6011;
539 602

Diff Legend

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