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.72 by pcg, Fri Jul 25 03:50:33 2003 UTC vs.
Revision 1.100 by pcg, Sun May 30 03:24:47 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 { 123package game::userpanel;
124
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 ];
130
131sub INIT_INSTANCE {
123 my ($self) = @_; 132 my ($self) = @_;
124 $self->stop;
125 $self->SUPER::destroy;
126}
127 133
128package game::userpanel;
129
130use base gtk::widget;
131
132sub new {
133 my $class = shift;
134 my $self = $class->SUPER::new(@_);
135
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;
190use Gtk2::GoBoard::Constants;
191
192use Glib::Object::Subclass
193 Gtk2::Window;
194
191use base KGS::Listener::Game; 195use base KGS::Listener::Game;
192use base KGS::Game; 196use base KGS::Game;
193 197
194use base gtk::widget;
195
196use POSIX qw(ceil); 198use POSIX qw(ceil);
197 199
198sub new { 200sub new {
199 my $self = shift; 201 my ($self, %arg) = @_;
200 $self = $self->SUPER::new(@_); 202 $self = $self->Glib::Object::new;
203 $self->{$_} = delete $arg{$_} for keys %arg;
201 204
202 $self->listen($self->{conn});
203
204 $self->{window} = new Gtk2::Window 'toplevel';
205 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 205 gtk::state $self, "game::window", undef, window_size => [600, 500];
206 206
207 $self->{window}->signal_connect(delete_event => sub { 207 $self->signal_connect (destroy => sub {
208 $self->part; 208 $self->unlisten;
209 $self->destroy; 209 delete $self->{app}{game}{$self->{channel}};
210 1; 210 %{$_[0]} = ();
211 }); 211 });#d#
212 212
213 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 213 $self->add (my $hpane = new Gtk2::HPaned);
214 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 214 gtk::state $hpane, "game::hpane", undef, position => 500;
215 215
216 # LEFT PANE 216 # LEFT PANE
217 217
218 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 218 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
219 219
220 $self->{boardbox} = new Gtk2::VBox; 220 $self->{boardbox} = new Gtk2::VBox;
221 221
222 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 222 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
223 223
224 # challenge
225
226 $self->{challenge} = new challenge channel => $self->{channel};
227
228 # board box (aspect/canvas) 224 # board box (aspect/canvas)
229 225
230 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 226 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
227
228 # RIGHT PANE
229
230 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
231 $hpane->set (position_set => 1);
232
233 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
231 234
232 { 235 {
233 $frame->add (my $vbox = new Gtk2::VBox); 236 $frame->add (my $vbox = new Gtk2::VBox);
234 $vbox->add ($self->{title} = new Gtk2::Label $title); 237 $vbox->add ($self->{title} = new Gtk2::Label $title);
235 238
244 $scale->set_digits (0); 247 $scale->set_digits (0);
245 248
246 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 249 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
247 } 250 }
248 251
249 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
250
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); 252 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
253
265 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 254 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
266 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 255 for COLOUR_WHITE, COLOUR_BLACK;
256
257 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
258
259 #$buttonbox->I#
267 260
268 $vbox->pack_start(($self->{text} = new chat), 1, 1, 0); 261 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
269 262
270 $self->event_update_game; 263 $self->set_channel ($self->{channel});
264
265 $self->show_all;
266
271 $self; 267 $self;
268}
269
270sub set_channel {
271 my ($self, $channel) = @_;
272
273 $self->{channel} = $channel;
274
275 if ($self->{channel} > 0) {
276 $self->listen ($self->{conn});
277
278 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
279 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
280
281 $self->signal_connect (delete_event => sub { $self->part; 1 });
282 $self->{chat}->signal_connect (command => sub {
283 my ($chat, $cmd, $arg) = @_;
284 if ($cmd eq "rsave") {
285 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
286 } else {
287 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
288 }
289 });
290 }
272} 291}
273 292
274sub event_update_users { 293sub event_update_users {
275 my ($self, $add, $update, $remove) = @_; 294 my ($self, $add, $update, $remove) = @_;
276 295
277 return unless $self->{userlist};
278
279 $self->{userlist}->update ($add, $update, $remove); 296# $self->{userlist}->update ($add, $update, $remove);
297
298 $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
299 for @$remove;
300
301 $self->{users_inlay}->refresh;
280 302
281 my %important; 303 my %important;
304 $important{$self->{black}{name}}++;
305 $important{$self->{white}{name}}++;
282 $important{$self->{user1}{name}}++; 306 $important{$self->{owner}{name}}++;
283 $important{$self->{user2}{name}}++;
284 $important{$self->{user3}{name}}++;
285 307
286 if (my @users = grep $important{$_->{name}}, @$add) { 308 if (my @users = grep $important{$_->{name}}, @$add) {
287 $self->{text}->append_text ("\n<header>Joins:</header>"); 309 $self->{chat}->append_text ("\n<header>Joins:</header>");
288 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 310 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
289 } 311 }
290 if (my @users = grep $important{$_->{name}}, @$remove) { 312 if (my @users = grep $important{$_->{name}}, @$remove) {
291 $self->{text}->append_text ("\n<header>Parts:</header>"); 313 $self->{chat}->append_text ("\n<header>Parts:</header>");
292 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 314 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
293 } 315 }
294
295} 316}
296 317
297sub join { 318sub join {
298 my ($self) = @_; 319 my ($self) = @_;
299 return if $self->{joined}; 320 return if $self->{joined};
300 321
301 $self->SUPER::join; 322 $self->SUPER::join;
302
303 $self->{window}->show_all;
304} 323}
305 324
306sub part { 325sub update_cursor {
307 my ($self) = @_; 326 my ($self) = @_;
308 327
309 $self->SUPER::part; 328 my $move = int $self->{moveadj}->get_value;
310 $self->destroy; 329 my $cb;
330
331 warn sprintf "move %d spath %d\n", $move, scalar @{$self->{path}};#d#
332 warn "isact " . $self->is_active;#d#
333 warn "flags $self->{flags}\n";#d#
334 warn "handi $self->{handicap}\n";#d#
335
336 my $running = $move == @{$self->{path}}; # && $self->is_active;
337
338 delete $self->{board_click};
339
340 warn "plaiyng $self->{playing} running $running last $self->{cur_board}{last}\n";#d#
341 if ($self->{teacher} eq $self->{app}{conn}) {
342 #TODO# # teaching mode not implemented
343 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
344 } elsif (!$self->{playing} || !$running) {
345 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
346 #TODO# # implement coordinate-grabbing
347 } elsif ($self->{black}{name} eq $self->{conn}{name} && $self->{cur_board}{last} == COLOUR_WHITE) {
348 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_B | MARK_GRAYED);
349 $self->{board_click} = sub {
350 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
351 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
352 delete $self->{board_click};
353 };
354 } elsif ($self->{white}{name} eq $self->{conn}{name} && $self->{cur_board}{last} == COLOUR_BLACK) {
355 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_W | MARK_GRAYED);
356 $self->{board_click} = sub {
357 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
358 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
359 delete $self->{board_click};
360 };
361 }
311} 362}
312 363
313sub update_board { 364sub update_board {
314 my ($self) = @_; 365 my ($self) = @_;
315 return unless $self->{path}; 366 return unless $self->{path};
316 367
317 my $move = int $self->{moveadj}->get_value; 368 my $move = int $self->{moveadj}->get_value;
318 369
319 my $running = $move == @{$self->{path}}; 370 my $running = $move == @{$self->{path}} && !$self->{teacher};
320 371
321 $self->{board_label}->set_text ("Move " . ($move - 1)); 372 $self->{board_label}->set_text ("Move " . ($move - 1));
322 373
323 $self->{cur_board} = new KGS::Game::Board $self->{size}; 374 $self->{cur_board} = new KGS::Game::Board $self->{size};
324 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 375 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
325 376
326 for my $colour (WHITE, BLACK) { 377 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
327 $self->{userpanel}[$colour]->set_state ( 378 $self->{userpanel}[$colour]->set_state (
328 $self->{cur_board}{captures}[$colour], 379 $self->{cur_board}{captures}[$colour],
329 $self->{cur_board}{timer}[$colour], 380 $self->{cur_board}{timer}[$colour],
330 ($running && $self->{lastmove_colour} == !$colour) 381 ($running && $self->{lastmove_colour} == !$colour)
331 ? $self->{lastmove_time} : 0 382 ? $self->{lastmove_time} : 0
332 ); 383 );
333 } 384 }
334 385
335 $self->{board}->set_board ($self->{cur_board}); 386 $self->{board}->set_board ($self->{cur_board});
387
388 $self->update_cursor;
336} 389}
337 390
338sub event_update_tree { 391sub event_update_tree {
339 my ($self) = @_; 392 my ($self) = @_;
340 393
387 }sgexi; 440 }sgexi;
388 441
389 $text .= $_; 442 $text .= $_;
390 } 443 }
391 444
392 $self->{text}->append_text ($text); 445 $self->{chat}->append_text ($text);
393} 446}
394 447
395sub event_join { 448sub event_join {
396 my ($self) = @_; 449 my ($self) = @_;
450
397 $self->SUPER::event_join; 451 $self->SUPER::event_join (@_);
452 $self->init_tree;
453 $self->event_update_game;
398} 454}
399 455
400sub event_part { 456sub event_part {
401 my ($self) = @_; 457 my ($self) = @_;
458
402 $self->SUPER::event_part; 459 $self->SUPER::event_part;
403 $self->destroy; 460 $self->destroy;
404} 461}
405 462
406sub event_move { 463sub event_move {
407 my ($self, $pass) = @_; 464 my ($self, $pass) = @_;
408 sound::play 1, $pass ? "pass" : "move"; 465 sound::play 1, $pass ? "pass" : "move";
466
467 if ($self->{undo_inlay}) {
468 (delete $self->{undo_inlay})->clear;
469 }
409} 470}
410 471
411sub event_update_game { 472sub event_update_game {
412 my ($self) = @_; 473 my ($self) = @_;
474
413 $self->SUPER::event_update_game; 475 $self->SUPER::event_update_game;
414 476
415 return unless $self->{window}; 477 return unless $self->{joined};
416 478
479 $self->{playing} = $self->{teacher} eq $self->{conn}{name}
480 || $self->is_playing ($self->{conn}{name});
481
417 my $title = defined $self->{channel} 482 my $title = defined $self->{channel}
418 ? $self->owner->as_string . " " . $self->opponent_string 483 ? $self->owner->as_string . " " . $self->opponent_string
419 : "Game Window"; 484 : "Game Window";
420 $self->{window}->set_title("KGS Game $title"); 485 $self->set_title("KGS Game $title");
421 $self->{title}->set_text ($title); 486 $self->{title}->set_text ($title);
422 487
423 $self->{user}[BLACK] = $self->{user1}; 488 $self->{user}[COLOUR_BLACK] = $self->{black};
424 $self->{user}[WHITE] = $self->{user2}; 489 $self->{user}[COLOUR_WHITE] = $self->{white};
425 490
426 # show board 491 # show board
492 if ($self->is_inprogress) {
493 if (!$self->{boardbox}->parent) {
494 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
495 $self->{left}->add ($self->{boardbox});
496 $self->{board}->signal_connect (button_release => sub {
497 if ($_[1] == 1) {
498 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
499 }
500 });
501 }
502 if (my $ch = delete $self->{challenge}) {
503 $_->{inlay}->destroy for values %$ch;
504 }
505 $self->update_cursor;
506 }
507
508 $self->{left}->show_all;
509
510 $self->{rules_inlay}->refresh;
427 511
428 $self->{left}->remove ($_) for $self->{left}->get_children; 512}
513
514sub draw_setup {
515 my ($self, $inlay) = @_;
516
517 return unless $self->{joined};
518
519 my $rules = $self->{rules};
520
521 my $text = "";
522
523 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
524 if $self->{teacher};
525
526 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
527 if $self->{owner}->is_valid;
528
429 if ($self->is_valid) { 529 if ($self->is_inprogress) {
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;
436
437 # view text
438
439 eval { #d#
440 my @ga;
441 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
442 . " (" . (util::toxml $gameopt{$self->option}) . ")";
443 $ga[1] = "\nFlags:";
444 $ga[1] .= " valid" if $self->is_valid;
445 $ga[1] .= " adjourned" if $self->is_adjourned;
446 $ga[1] .= " scored" if $self->is_scored;
447 $ga[1] .= " saved" if $self->is_saved;
448
449 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
450
451 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 530 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
452 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 531 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
453 if $self->is_valid;
454
455 if ($self->is_valid) {
456 $ga[4] = "\nHandicap: " . $self->{handicap};
457 $ga[5] = "\nKomi: " . $self->{komi};
458 $ga[6] = "\nSize: " . $self->size_string;
459 }
460
461 if ($self->is_scored) {
462 $ga[7] = "\nResult: " . $self->score_string;
463 }
464
465 $text = "\n<infoblock><header>Game Update</header>";
466 for (0..7) {
467 if ($self->{gatext}[$_] ne $ga[$_]) {
468 $text .= $ga[$_];
469 }
470 }
471 $text .= "</infoblock>";
472
473 $self->{gatext} = \@ga;
474 }; 532 }
475 533 $text .= "\nType: " . util::toxml $gametype{$self->type};
476 $self->{text}->append_text ($text);
477}
478
479sub event_update_rules {
480 my ($self, $rules) = @_;
481
482 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
483 for BLACK, WHITE;
484
485 sound::play 3, "gamestart";
486
487 my $text = "\n<header>Game Rules</header>";
488 534
489 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 535 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
490 536
491 $text .= "\nTime: "; 537 $text .= "\nTime: ";
492 538
494 $text .= "UNLIMITED"; 540 $text .= "UNLIMITED";
495 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 541 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
496 $text .= util::format_time $rules->{time}; 542 $text .= util::format_time $rules->{time};
497 $text .= " ABS"; 543 $text .= " ABS";
498 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 544 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
499 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 545 $text .= util::format_time $rules->{time};
500 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; 546 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
501 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 547 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
502 $text .= util::format_time $rules->{time}; 548 $text .= util::format_time $rules->{time};
503 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 549 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
504 } 550 }
505 551
552 $text .= "\nFlags:";
553 $text .= " private" if $self->is_private;
554 $text .= " started" if $self->is_inprogress;
555 $text .= " adjourned" if $self->is_adjourned;
556 $text .= " scored" if $self->is_scored;
557 $text .= " saved" if $self->is_saved;
558
559 if ($self->is_inprogress) {
560 $text .= "\nHandicap: " . $self->{handicap};
561 $text .= "\nKomi: " . $self->{komi};
562 $text .= "\nSize: " . $self->size_string;
563 }
564
565 if ($self->is_scored) {
566 $text .= "\nResult: " . $self->score_string;
567 }
568
506 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 569 $inlay->append_text ("<infoblock>$text</infoblock>");
507}
508 570
509sub inject_resign_game { 571}
572
573sub event_update_rules {
510 my ($self, $msg) = @_; 574 my ($self, $rules) = @_;
575
576 $self->{rules} = $rules;
577
578 if ($self->{user}) {
579 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
580 for COLOUR_BLACK, COLOUR_WHITE;
581 }
582
583 sound::play 3, "gamestart";
584
585 $self->{rules_inlay}->refresh;
586}
587
588sub event_resign_game {
589 my ($self, $player) = @_;
511 590
512 sound::play 3, "resign"; 591 sound::play 3, "resign";
513
514 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 592 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
515 . "\n<user>" 593 . "\n<user>"
516 . (util::toxml $self->{user}[$msg->{player}]->as_string) 594 . (util::toxml $self->{user}[$msg->{player}]->as_string)
517 . "</user> resigned.</infoblock>"); 595 . "</user> resigned.</infoblock>");
518} 596}
519 597
598sub event_out_of_time {
599 my ($self, $player) = @_;
600
601 sound::play 3, "timewin";
602 $self->{chat}->append_text ("\n<infoblock><header>Time Over</header>"
603 . "\n<user>"
604 . (util::toxml $self->{user}[$msg->{player}]->as_string)
605 . "</user> ran out of time.</infoblock>");
606}
607
520sub inject_final_result { 608sub inject_final_result {
521 my ($self, $msg) = @_; 609 my ($self, $msg) = @_;
522 610
523 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 611 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
524 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 612 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
525 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 613 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
526 . "</infoblock>" 614 . "</infoblock>"
527 ); 615 );
528} 616}
529 617
618sub inject_req_undo {
619 my ($self, $msg) = @_;
620
621 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
622 return if $inlay->{ignore};
623
624 $inlay->{count}++;
625 $inlay->clear;
626 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
627 $inlay->append_button ("Grant", sub {
628 $inlay->clear;
629 $self->send (grant_undo => channel => $self->{channel});
630 });
631 $inlay->append_button ("Ignore", sub {
632 $inlay->clear;
633 $inlay->{ignore} = 1;
634 # but leave inlay, so further undo requests get counted
635 });
636
637}
638
639sub inject_new_game {
640 my ($self, $msg) = @_;
641
642 $self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>");
643 delete $self->{cid};
644}
645
646sub draw_challenge {
647 my ($self, $id) = @_;
648
649 my $info = $self->{challenge}{$id};
650 my $inlay = $info->{inlay};
651 my $rules = $info->{rules};
652 warn "drawchal $id\n";#d#
653# use PApp::Util; warn PApp::Util::dumpval $challenge;#d#
654
655 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
656 my $opponent = $as_black ? $info->{white} : $info->{black};
657
658 my ($size, $time, $interval, $count);
659
660 if (!$self->{channel}) {
661 $inlay->append_text ("\nNotes: ");
662 $inlay->append_entry (\$info->{notes}, 20, "");
663 $inlay->append_text ("\nGlobal Offer: ");
664 $inlay->append_optionmenu (\$info->{flags},
665 0 => "No",
666 2 => "Yes",
667 );
668 } else {
669 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
670 }
671
672 $inlay->append_text ("\nType: ");
673 $inlay->append_optionmenu (
674 \$info->{gametype},
675 GAMETYPE_DEMONSTRATION , "Demonstration",
676 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)",
677 GAMETYPE_TEACHING , "Teaching",
678 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)",
679 GAMETYPE_SIMUL , "Simul (not yet!)",
680 GAMETYPE_FREE , "Free",
681 GAMETYPE_RATED , "Rated",
682 sub {
683 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
684 },
685 );
686
687 if ($self->{channel}) {
688 $inlay->append_text ("\nMy Colour: ");
689 $inlay->append_optionmenu (
690 \$as_black,
691 0 => "White",
692 1 => "Black",
693 sub {
694 if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
695 ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
696 }
697 }
698 );
699 }
700
701 $inlay->append_text ("\nRuleset: ");
702 $inlay->append_optionmenu (
703 \$info->{rules}{ruleset},
704 RULESET_JAPANESE , "Japanese",
705 RULESET_CHINESE , "Chinese",
706 RULESET_AGA , "AGA",
707 RULESET_NEW_ZEALAND, "New Zealand",
708 );
709
710 $inlay->append_text ("\nSize: ");
711 $size = $inlay->append_optionmenu (
712 \$info->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38
713 );
714
715 if ($self->{channel}) {
716 $inlay->append_text ("\nHandicap: ");
717 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
718
719 $inlay->append_text ("\nKomi: ");
720 $inlay->append_entry (\$info->{rules}{komi}, 5);
721 }
722
723 $inlay->append_text ("\nTimesys: ");
724 $inlay->append_optionmenu (
725 \$info->{rules}{timesys},
726 &TIMESYS_NONE => "None",
727 &TIMESYS_ABSOLUTE => "Absolute",
728 &TIMESYS_BYO_YOMI => "Byo Yomi",
729 &TIMESYS_CANADIAN => "Canadian",
730 sub {
731 my ($new) = @_;
732
733 if ($new eq TIMESYS_NONE) {
734 $time->hide;
735 $interval->hide;
736 $count->hide;
737 } else {
738 $time->show;
739 $time->set_text ($self->{app}{defaults}{time});
740 if ($new eq TIMESYS_ABSOLUTE) {
741 $interval->hide;
742 $count->hide;
743 } else {
744 $interval->show;
745 $count->show;
746 if ($new eq TIMESYS_BYO_YOMI) {
747 $interval->set_text ($self->{app}{defaults}{byo_time});
748 $count->set_text ($self->{app}{defaults}{byo_period});
749 } elsif ($new eq TIMESYS_CANADIAN) {
750 $interval->set_text ($self->{app}{defaults}{can_time});
751 $count->set_text ($self->{app}{defaults}{can_period});
752 }
753 }
754 }
755 }
756 );
757
758 $inlay->append_text ("\nMain Time: ");
759 $time = $inlay->append_entry (\$info->{rules}{time}, 5);
760 $inlay->append_text ("\nInterval: ");
761 $interval = $inlay->append_entry (\$info->{rules}{interval}, 3);
762 $inlay->append_text ("\nPeriods/Stones: ");
763 $count = $inlay->append_entry (\$info->{rules}{count}, 2);
764
765 $inlay->append_text ("\n");
766
767 if (!$self->{channel}) {
768 $inlay->append_button ("Create Challenge", sub {
769 $inlay->clear;
770 $self->{cid} = $self->{conn}->alloc_clientid;
771 $self->send (new_game =>
772 channel => delete $self->{roomid},
773 gametype => $info->{gametype},
774 cid => $self->{cid},
775 flags => $info->{flags},
776 rules => $info->{rules},
777 notes => $info->{notes},
778 );
779 });
780 } else {
781 $inlay->append_button ("OK", sub {
782 $inlay->clear;
783 $self->send (challenge =>
784 channel => $self->{channel},
785 black => $info->{black},
786 white => $info->{white},
787 gametype => $info->{gametype},
788 cid => $info->{cid},
789 rules => $info->{rules},
790 );
791 });
792 if (exists $self->{challenge}{""}) {
793 $inlay->append_button ("Reject", sub {
794 $inlay->clear;
795 $self->send (reject_challenge =>
796 channel => $self->{channel},
797 name => $opponent->{name},
798 gametype => $info->{gametype},
799 cid => $info->{cid},
800 rules => $info->{rules},
801 );
802 });
803 }
804 }
805}
806
807sub draw_users {
808 my ($self, $inlay) = @_;
809
810 for (sort keys %{$self->{users}}) {
811 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
812 }
813}
814
530sub event_challenge { 815sub event_challenge {
531 my ($self, $challenge) = @_;
532
533 use KGS::Listener::Debug;
534 $self->{text}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
535}
536
537sub destroy {
538 my ($self) = @_; 816 my ($self, $info) = @_;
539 817
540 delete $self->{app}{gamelist}{game}{$self->{channel}}; 818 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
541 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 819 my $opponent = $as_black ? $info->{white} : $info->{black};
542 for BLACK, WHITE; 820
543 $self->SUPER::destroy; 821 my $id = $opponent->{name};
822
823 warn "challenge from $opponent->{name}\n";#d#
824
825 $self->{challenge}{$id} = $info;
826 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
827 exists $self->{challenge}{""}
828 ? "Challenge from $opponent->{name}"
829 : "Challenge to $opponent->{name}",
830 sub {
831 $self->{challenge}{$id}{inlay} = $_[0];
832 $self->draw_challenge ($id);
833 },
834 1 || !exists $self->{challenge}{""} # only open when not offerer
835 );
544} 836}
545 837
5461; 8381;
547 839

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines