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.93 by pcg, Tue May 25 18:36:36 2004 UTC vs.
Revision 1.127 by root, Thu Jun 3 03:46:21 2004 UTC

1use utf8; 1use utf8;
2 2
3use Scalar::Util (); 3use Scalar::Util ();
4
5### GO CLOCK WIDGET #########################################################
4 6
5package game::goclock; 7package game::goclock;
6 8
7# Lo and Behold! I admit it! The rounding stuff etc.. in goclock 9# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
8# is completely borked. 10# is completely borked.
… …
21 23
22 $self->{set} = sub { }; 24 $self->{set} = sub { };
23 $self->{format} = sub { "???" }; 25 $self->{format} = sub { "???" };
24} 26}
25 27
28sub FINALIZE_INSTANCE {
29 my $self = shift;
30
31 $self->stop;
32}
33
26sub configure { 34sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_; 35 my ($self, $timesys, $main, $interval, $count) = @_;
28 36
29 if ($timesys == TIMESYS_ABSOLUTE) { 37 if ($timesys == TIMESYS_ABSOLUTE) {
30 $self->{set} = sub { $self->{time} = $_[0] }; 38 $self->{format} = sub {
31 $self->{format} = sub { util::format_time $_[0] }; 39 if ($_[0] < 0) {
40 "TIMEOUT";
41 } else {
42 util::format_time $_[0];
43 }
44 };
32 45
33 } elsif ($timesys == TIMESYS_BYO_YOMI) { 46 } elsif ($timesys == TIMESYS_BYO_YOMI) {
34 my $low = $interval * $count; 47 my $low = $interval * $count;
35 48
36 $self->{set} = sub { $self->{time} = $_[0] };
37
38 $self->{format} = sub { 49 $self->{format} = sub {
50 if ($_[0] < 0) {
51 "TIMEOUT";
39 if ($_[0] > $low) { 52 } elsif ($_[0] > $low) {
40 util::format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
41 } else { 54 } else {
42 sprintf "%s (%d)", 55 sprintf "%s (%d)",
43 util::format_time int (($_[0] - 1) % $interval + 1), 56 util::format_time int (($_[0] - 1) % $interval + 1),
44 ($_[0] - 1) / $interval; 57 ($_[0] - 1) / $interval;
45 } 58 }
46 }; 59 };
47 60
48 } elsif ($timesys == TIMESYS_CANADIAN) { 61 } elsif ($timesys == TIMESYS_CANADIAN) {
49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
50
51 $self->{format} = sub { 62 $self->{format} = sub {
63 if ($_[0] < 0) {
64 "TIMEOUT";
52 if (!$self->{moves}) { 65 } elsif (!$self->{moves}) {
53 util::format_time $_[0] - $low; 66 util::format_time $_[0] - $low;
54 } else { 67 } else {
55 my $time = int (($_[0] - 1) % $interval + 1); 68 my $time = int (($_[0] - 1) % $interval + 1);
56 69
57 sprintf "%s/%d =%d", 70 sprintf "%s/%d =%d",
… …
63 } 76 }
64 }; 77 };
65 78
66 } else { 79 } else {
67 # none, or unknown 80 # none, or unknown
68 $self->{set} = sub { };
69 $self->{format} = sub { "---" } 81 $self->{format} = sub { "-" }
70 } 82 }
71} 83}
72 84
73sub refresh { 85sub refresh {
74 my ($self, $timestamp) = @_; 86 my ($self, $timestamp) = @_;
75 my $timer = $self->{time} + $self->{start} - $timestamp; 87 my $timer = $self->{time} + $self->{start} - $timestamp;
76 88
77 # we round the timer value slightly... the protocol isn't exact anyways, 89 # we round the timer value slightly... the protocol isn't exact anyways,
78 # and this gives smoother timers ;) 90 # and this gives smoother timers ;)
79 my @format = $self->{format}->(int ($timer + 0.4)); 91 my $timer2 = int $timer + 0.4;
92
80 $self->set_text ($self->{format}->(int ($timer + 0.4))); 93 $self->set_text ($self->{format}->($timer2));
81 94
82 $timer - int $timer; 95 $timer - int $timer;
83} 96}
84 97
85sub set_time { 98sub set_time {
86 my ($self, $time) = @_; 99 my ($self, $start, $time, $moves) = @_;
87 100
88 # we ignore requests to re-set the time of a running clock. 101 $self->{time} = $time;
89 # this is the easiest way to ensure that commentary etc. 102 $self->{moves} = $moves;
90 # doesn't re-set the clock. yes, this is frickle design, 103
91 # but I think the protocol is to blame here, which gives 104 if ($start) {
92 # very little time information. (cgoban2 also has had quite 105 $self->{start} = $start;
93 # a lot of small time update problems...) 106 $self->start;
94 unless ($self->{timeout}) { 107 } else {
95 $self->{set}->($time->[0], $time->[1]); 108 $self->stop;
96 $self->refresh ($self->{start}); 109 $self->refresh ($self->{start});
97 } 110 }
98} 111}
99 112
100sub start { 113sub start {
101 my ($self, $when) = @_; 114 my ($self) = @_;
102 115
103 $self->stop; 116 $self->stop;
104
105 $self->{start} = $when;
106 117
107 my $timeout; $timeout = sub { 118 my $timeout; $timeout = sub {
108 my $next = $self->refresh (Time::HiRes::time) * 1000; 119 my $next = $self->refresh (Time::HiRes::time) * 1000;
109 $next += 1000 if $next < 0; 120 $next += 1000 if $next < 0;
110 $self->{timeout} = add Glib::Timeout $next, $timeout; 121 $self->{timeout} = add Glib::Timeout $next, $timeout;
… …
118 my ($self) = @_; 129 my ($self) = @_;
119 130
120 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 131 remove Glib::Source delete $self->{timeout} if $self->{timeout};
121} 132}
122 133
134### USER PANEL ##############################################################
135
123package game::userpanel; 136package game::userpanel;
124 137
138use KGS::Constants;
139
125use Glib::Object::Subclass 140use Glib::Object::Subclass
126 Gtk2::HBox, 141 Gtk2::Frame,
127 properties => [ 142 properties => [
128 Glib::ParamSpec->IV ("colour", "colour", "User Colour", 0, 1, 0, [qw(construct-only writable)]), 143 Glib::ParamSpec->IV ("colour", "colour", "User Colour",
144 COLOUR_BLACK, COLOUR_WHITE, COLOUR_BLACK,
145 [qw(construct-only readable writable)]),
129 ]; 146 ];
130 147
131sub INIT_INSTANCE { 148sub INIT_INSTANCE {
132 my ($self) = @_; 149 my ($self) = @_;
133 150
134 $self->add (my $vbox = new Gtk2::VBox); 151 $self->add (my $vbox = new Gtk2::VBox);
135 152
136 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 153 $vbox->pack_start (($self->{name} = new Gtk2::Label "-"), 1, 1, 0);
137 $vbox->add ($self->{info} = new Gtk2::Label ""); 154 $vbox->pack_start (($self->{info} = new Gtk2::Label "-"), 1, 1, 0);
138 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock}; 155 $vbox->pack_start (($self->{clock} = new game::goclock), 1, 1, 0);
139 156
140 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 157 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
141 158
142 $self; 159 $self;
143} 160}
… …
167 } 184 }
168 185
169 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); 186 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
170} 187}
171 188
172sub set_state { 189sub set_captures {
173 my ($self, $captures, $timer, $when) = @_; 190 my ($self, $captures) = @_;
174
175 $self->{clock}->stop unless $when;
176 $self->{clock}->set_time ($timer);
177 $self->{clock}->start ($when) if $when;
178 191
179 $self->{info}->set_text ("$captures pris."); 192 $self->{info}->set_text ("$captures pris.");
180} 193}
194
195sub set_timer {
196 my ($self, $start, $time, $moves) = @_;
197
198 $self->{clock}->set_time ($start, $time, $moves);
199}
200
201### GAME WINDOW #############################################################
181 202
182package game; 203package game;
183 204
184use Scalar::Util qw(weaken); 205use Scalar::Util qw(weaken);
185 206
186use KGS::Constants; 207use KGS::Constants;
187use KGS::Game::Board; 208use KGS::Game::Board;
188 209
189use Gtk2::GoBoard; 210use Gtk2::GoBoard;
211use Gtk2::GoBoard::Constants;
212
213use base KGS::Game;
214use base KGS::Listener::Game;
190 215
191use Glib::Object::Subclass 216use Glib::Object::Subclass
192 Gtk2::Window; 217 Gtk2::Window;
193 218
194use base KGS::Listener::Game;
195use base KGS::Game;
196
197use POSIX qw(ceil); 219use POSIX qw(ceil);
198 220
199sub new { 221sub new {
200 my ($self, %arg) = @_; 222 my ($self, %arg) = @_;
223
201 $self = $self->Glib::Object::new; 224 $self = $self->Glib::Object::new;
202 $self->{$_} = delete $arg{$_} for keys %arg; 225 $self->{$_} = delete $arg{$_} for keys %arg;
203 226
204 $self->listen ($self->{conn});
205
206 gtk::state $self, "game::window", undef, window_size => [600, 500]; 227 gtk::state $self, "game::window", undef, window_size => [620, 460];
228 $self->set (allow_shrink => 1);
207 229
208 $self->signal_connect (delete_event => sub { $self->part; 1 });
209 $self->signal_connect (destroy => sub { 230 $self->signal_connect (destroy => sub {
210 $self->unlisten; 231 $self->unlisten;
211 delete $self->{app}{game}{$self->{channel}}; 232 delete $self->{app}{game}{$self->{channel}};
212 %{$_[0]} = (); 233 %{$_[0]} = ();
213 });#d# 234 });#d#
214 235
215 $self->add (my $hpane = new Gtk2::HPaned); 236 $self->add (my $hpane = new Gtk2::HPaned);
216 gtk::state $hpane, "game::hpane", undef, position => 500; 237 gtk::state $hpane, "game::hpane", undef, position => 420;
217 238
218 # LEFT PANE 239 # LEFT PANE
219 240
220 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0); 241 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
221 242
222 $self->{boardbox} = new Gtk2::VBox;
223
224 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 243 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
225 244
226 # board box (aspect/canvas) 245 # board box (aspect/canvas)
227 246
228 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
229
230 # RIGHT PANE 247 # RIGHT PANE
231 248
232 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1); 249 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
233 $hpane->set (position_set => 1); 250 $hpane->set (position_set => 1);
234 251
235 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0); 252 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
236 253
237 { 254 {
238 $frame->add (my $vbox = new Gtk2::VBox); 255 $frame->add (my $vbox = new Gtk2::VBox);
239 $vbox->add ($self->{title} = new Gtk2::Label $title); 256 $vbox->add ($self->{title} = new Gtk2::Label "-");
240 257
241 $vbox->add (my $hbox = new Gtk2::HBox); 258 $vbox->add (my $hbox = new Gtk2::HBox);
242 259
243 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0); 260 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 0, 0);
244 261
245 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 262 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
246 263
247 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); 264 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
248 $scale->set_draw_value (0); 265 $scale->set_draw_value (0);
249 $scale->set_digits (0); 266 $scale->set_digits (0);
250 267
251 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 268 $self->{moveadj}->signal_connect (value_changed => sub {
269 $self->{showmove} = int $self->{moveadj}->get_value;
270 $self->update_board;
271 });
252 } 272 }
253 273
254 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 274 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
255 275
256 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_) 276 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
257 for COLOUR_WHITE, COLOUR_BLACK; 277 for COLOUR_WHITE, COLOUR_BLACK;
278
279 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
280
281 $buttonbox->add ($self->{button_pass} =
282 Gtk2::Button->Glib::Object::new (label => "Pass", visible => 0));
283 $self->{button_pass}->signal_connect (clicked => sub {
284 $self->{board_click}->(255, 255) if $self->{board_click};
285 });
286 eval { $self->{button_pass}->set (no_show_all => 1) }; # workaround for gtk+-2.2
287 $buttonbox->add ($self->{button_undo} =
288 Gtk2::Button->Glib::Object::new (label => "Undo", visible => 0));
289 $self->{button_undo}->signal_connect (clicked => sub {
290 $self->send (req_undo => channel => $self->{channel});
291 });
292 eval { $self->{button_undo}->set (no_show_all => 1) }; # workaround for gtk+-2.2
293 $buttonbox->add ($self->{button_resign} =
294 Gtk2::Button->Glib::Object::new (label => "Resign", visible => 0));
295 $self->{button_resign}->signal_connect (clicked => sub {
296 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
297 });
298 eval { $self->{button_resign}->set (no_show_all => 1) }; # workaround for gtk+-2.2
258 299
259 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0); 300 $vbox->pack_start (($self->{chat} = new chat), 1, 1, 0);
260 301
261 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Rules", sub { $self->draw_rules (@_) }, 1); 302 $self->set_channel ($self->{channel});
262 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 0);
263 303
264 $self->{chat}->signal_connect (command => sub { 304 $self->show_all;
265 my ($chat, $cmd, $arg) = @_;
266 if ($cmd eq "rsave") {
267 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
268 } else {
269 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
270 }
271 });
272 305
273 $self; 306 $self;
307}
308
309sub set_channel {
310 my ($self, $channel) = @_;
311
312 $self->{channel} = $channel;
313
314 if ($self->{channel} > 0) {
315 $self->listen ($self->{conn});
316
317 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
318 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
319
320 $self->signal_connect (delete_event => sub { $self->part; 1 });
321 $self->{chat}->signal_connect (command => sub {
322 my ($chat, $cmd, $arg) = @_;
323 if ($cmd eq "rsave") {
324 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
325 } else {
326 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
327 }
328 });
329 }
330}
331
332### JOIN/LEAVE ##############################################################
333
334sub join {
335 my ($self) = @_;
336 return if $self->{joined};
337
338 $self->SUPER::join;
339}
340
341sub part {
342 my ($self) = @_;
343
344 $self->hide;
345 $self->SUPER::part;
346}
347
348sub event_join {
349 my ($self) = @_;
350
351 $self->SUPER::event_join (@_);
352 $self->init_tree;
353 $self->event_update_game;
354}
355
356sub event_part {
357 my ($self) = @_;
358
359 $self->SUPER::event_part;
360 $self->destroy;
361}
362
363sub event_quit {
364 my ($self) = @_;
365
366 $self->SUPER::event_quit;
367 $self->destroy;
368}
369
370### USERS ###################################################################
371
372sub draw_users {
373 my ($self, $inlay) = @_;
374
375 for (sort keys %{$self->{users}}) {
376 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
377 }
274} 378}
275 379
276sub event_update_users { 380sub event_update_users {
277 my ($self, $add, $update, $remove) = @_; 381 my ($self, $add, $update, $remove) = @_;
278 382
279# $self->{userlist}->update ($add, $update, $remove); 383# $self->{userlist}->update ($add, $update, $remove);
280 384
385 $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
386 for @$remove;
387
281 $self->{users_inlay}->refresh; 388 $self->{users_inlay}->refresh;
282 389
283 my %important; 390 my %important;
391 $important{$self->{black}{name}}++;
392 $important{$self->{white}{name}}++;
284 $important{$self->{user1}{name}}++; 393 $important{$self->{owner}{name}}++;
285 $important{$self->{user2}{name}}++;
286 $important{$self->{user3}{name}}++;
287 394
288 if (my @users = grep $important{$_->{name}}, @$add) { 395 if (my @users = grep $important{$_->{name}}, @$add) {
289 $self->{chat}->append_text ("\n<header>Joins:</header>"); 396 $self->{chat}->append_text ("\n<leader>Joins:</leader>");
290 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 397 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
291 } 398 }
292 if (my @users = grep $important{$_->{name}}, @$remove) { 399 if (my @users = grep $important{$_->{name}}, @$remove) {
293 $self->{chat}->append_text ("\n<header>Parts:</header>"); 400 $self->{chat}->append_text ("\n<leader>Parts:</leader>");
294 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 401 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
295 } 402 }
296
297} 403}
298 404
299sub join { 405### GAME INFO ###############################################################
406
407sub draw_setup {
300 my ($self) = @_; 408 my ($self, $inlay) = @_;
409
301 return if $self->{joined}; 410 return unless $self->{joined};
302 411
303 $self->SUPER::join; 412 my $rules = $self->{rules};
413
414 my $text = "";
415
416 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
417 if $self->{teacher};
418
419 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
420 if $self->{owner}->is_valid;
421
422 if ($self->is_inprogress) {
423 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
424 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
425 }
426 $text .= "\nType: " . util::toxml $gametype{$self->type};
427
428 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
429
430 $text .= "\nTime: ";
431
432 if ($rules->{timesys} == TIMESYS_NONE) {
433 $text .= "UNLIMITED";
434 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
435 $text .= util::format_time $rules->{time};
436 $text .= " ABS";
437 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
438 $text .= util::format_time $rules->{time};
439 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
440 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
441 $text .= util::format_time $rules->{time};
442 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
443 }
444
445 $text .= "\nFlags:";
446 $text .= " private" if $self->is_private;
447 $text .= " started" if $self->is_inprogress;
448 $text .= " adjourned" if $self->is_adjourned;
449 $text .= " scored" if $self->is_scored;
450 $text .= " saved" if $self->is_saved;
451
452 if ($self->is_inprogress) {
453 $text .= "\nHandicap: " . $self->{handicap};
454 $text .= "\nKomi: " . $self->{komi};
455 $text .= "\nSize: " . $self->size_string;
456 }
457
458 if ($self->is_scored) {
459 $text .= "\nResult: " . $self->score_string;
460 }
461
462 $inlay->append_text ("<infoblock>$text</infoblock>");
463
464}
465
466sub event_update_game {
467 my ($self) = @_;
468
469 $self->SUPER::event_update_game;
470
471 return unless $self->{joined};
472
473 $self->{colour} = $self->player_colour ($self->{conn}{name});
474
475 $self->{user}[COLOUR_BLACK] = $self->{black};
476 $self->{user}[COLOUR_WHITE] = $self->{white};
477
478 # show board
479 if ($self->is_inprogress) {
480 if (!$self->{board}) {
481 $self->{left}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
482 $self->{board}->signal_connect (button_release => sub {
483 return unless $self->{cur_board};
484 if ($_[1] == 1) {
485 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
486 }
487 });
488 $self->{board}->show_all;
489 }
490 if (my $ch = delete $self->{challenge}) {
491 $_->{inlay}->destroy for values %$ch;
492 }
493 $self->update_cursor;
494 }
495
496 my $title = defined $self->{channel}
497 ? $self->owner->as_string . " " . $self->opponent_string
498 : "Game Window";
499 $self->set_title ("KGS Game $title");
500 $self->{title}->set_text ($title); # title gets redrawn wrongly
501
502 $self->{rules_inlay}->refresh;
503
504 if (exists $self->{teacher}) {
505 $self->{teacher_inlay} ||= $self->{chat}->new_inlay;
506 $self->{teacher_inlay}->clear;
507 $self->{teacher_inlay}->append_text ("\n<header>Teacher:</header> <user>"
508 . (util::toxml $self->{teacher}) . "</user>");
509 } elsif ($self->{teacher_inlay}) {
510 (delete $self->{teacher_inlay})->clear;
511 }
512
513 $self->update_cursor;
514}
515
516sub event_update_rules {
517 my ($self, $rules) = @_;
518
519 $self->{rules} = $rules;
520
521 if ($self->{user}) {
522 # todo. gets drawn wrongly
523
524 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
525 for COLOUR_BLACK, COLOUR_WHITE;
526 }
527
528 sound::play 3, "gamestart";
529 $self->{rules_inlay}->refresh;
530}
531
532### BOARD DISPLAY ###########################################################
533
534sub update_timers {
535 my ($self, $timers) = @_;
536
537 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
538
539 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
540 my $t = $timers->[$colour];
541 $self->{userpanel}[$colour]->set_timer (
542 $running && $colour == $self->{whosemove} && $t->[0],
543 $t->[1] || $self->{rules}{time}
544 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
545 && $self->{rules}{interval} * $self->{rules}{count}),
546 $t->[2]);
547 }
548}
549
550sub inject_set_gametime {
551 my ($self, $msg) = @_;
552
553 $self->{timers} = [
554 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
555 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
556 ];
557
558 $self->update_timers ($self->{timers})
559 if $self->{showmove} == @{$self->{path}};
560}
561
562sub update_cursor {
563 my ($self) = @_;
564
565 return unless $self->{cur_board};
566
567 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
568
569 delete $self->{board_click};
570
571 if ($self->{teacher} eq $self->{app}{conn}) {
572 #TODO# # teaching mode not implemented
573 $self->{button_pass}->set (label => "Pass", sensitive => 1);
574 $self->{button_pass}->show;
575 $self->{button_undo}->hide;
576 $self->{button_resign}->hide;
577 $self->{board}->set (cursor => undef);
578
579 } elsif ($running && $self->{colour} != COLOUR_NONE) {
580 # during game
581 $self->{button_undo}->show;
582 $self->{button_resign}->show;
583
584 if ($self->{cur_board}{score}) {
585 # during scoring
586 $self->{button_pass}->set (label => "Done", sensitive => 1);
587 $self->{button_pass}->show;
588 $self->{board}->set (cursor => sub {
589 $_[0] & (MARK_B | MARK_W)
590 ? $_[0] ^ MARK_GRAYED
591 : $_[0];
592 });
593 $self->{board_click} = sub {
594 if ($_[0] == 255) {
595 $self->{button_pass}->sensitive (0);
596 $self->done;
597 } else {
598 $self->send (mark_dead =>
599 channel => $self->{channel},
600 x => $_[0],
601 y => $_[1],
602 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
603 );
604 }
605 };
606
607 } elsif ($self->{colour} == $self->{whosemove}) {
608 # normal move
609 $self->{button_pass}->set (label => "Pass", sensitive => 1);
610 $self->{button_pass}->show;
611 $self->{board}->set (cursor => sub {
612 $self->{cur_board}
613 && $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
614 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
615 ? $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
616 : $_[0];
617 });
618 $self->{board_click} = sub {
619 return unless
620 $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
621 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND);
622 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
623 $self->{board}->set (cursor => undef);
624 delete $self->{board_click};
625 $self->{button_pass}->sensitive (0);
626 };
627 } else {
628 $self->{button_pass}->set (label => "Pass", sensitive => 0);
629 $self->{button_pass}->show;
630 $self->{board}->set (cursor => undef);
631 }
632 } else {
633 $self->{button_undo}->hide;
634 $self->{button_resign}->hide;
635 $self->{button_pass}->hide;
636 $self->{board}->set (cursor => undef);
637 #TODO# # implement coordinate-grabbing
638 }
304} 639}
305 640
306sub update_board { 641sub update_board {
307 my ($self) = @_; 642 my ($self) = @_;
643
308 return unless $self->{path}; 644 return unless $self->{path};
309 645
310 my $move = int $self->{moveadj}->get_value;
311
312 my $running = $move == @{$self->{path}};
313
314 $self->{board_label}->set_text ("Move " . ($move - 1)); 646 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
315 647
316 $self->{cur_board} = new KGS::Game::Board $self->{size}; 648 $self->{cur_board} = new KGS::Game::Board $self->{size};
317 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 649 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
318 650
651 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
652 if ($self->{curnode}{move} == 0) {
653 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
654 } else {
655 $self->{whosemove} = 1 - $self->{cur_board}{last};
656 }
657 } else {
658 # Chinese, Aga, NZ all have manual placement
659 if ($self->{curnode}{move} < $self->{handicap}) {
660 $self->{whosemove} = COLOUR_BLACK;
661 } elsif ($self->{curnode}{move} == $self->{handicap}) {
662 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
663 } else {
664 $self->{whosemove} = 1 - $self->{cur_board}{last};
665 }
666 }
667
668 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
319 for my $colour (COLOUR_WHITE, COLOUR_BLACK) { 669 for COLOUR_WHITE, COLOUR_BLACK;
320 $self->{userpanel}[$colour]->set_state ( 670
321 $self->{cur_board}{captures}[$colour], 671 my $start_time = $self->{rules}{time};
672
673 if ($self->{showmove} == @{$self->{path}}) {
674 $self->{timers} = [
675 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
676 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
677 ];
678 $self->update_timers ($self->{timers});
679 } else {
680 $self->update_timers ([
322 $self->{cur_board}{timer}[$colour], 681 [0, @{$self->{cur_board}{timer}[0]}],
323 ($running && $self->{lastmove_colour} == !$colour) 682 [0, @{$self->{cur_board}{timer}[1]}],
324 ? $self->{lastmove_time} : 0
325 ); 683 ]);
326 } 684 }
327 685
328 $self->{board}->set_board ($self->{cur_board}); 686 $self->{board}->set_board ($self->{cur_board});
687
688 if ($self->{cur_board}{score}) {
689 $self->{score_inlay} ||= $self->{chat}->new_inlay;
690 $self->{score_inlay}->clear;
691 $self->{score_inlay}->append_text ("\n<header>Scoring</header>"
692 . "\n<score>"
693 . "White: $self->{cur_board}{score}[COLOUR_WHITE], "
694 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
695 . "</score>");
696 } elsif ($self->{score_inlay}) {
697 (delete $self->{score_inlay})->clear;
698 }
699
700 $self->update_cursor;
701
329} 702}
330 703
331sub event_update_tree { 704sub event_update_tree {
332 my ($self) = @_; 705 my ($self) = @_;
706
707 (delete $self->{undo_inlay})->clear
708 if $self->{undo_inlay};
333 709
334 $self->{path} = $self->get_path; 710 $self->{path} = $self->get_path;
335 711
336 if ($self->{moveadj}) { 712 if ($self->{moveadj}) {
337 my $upper = $self->{moveadj}->upper; 713 my $upper = $self->{moveadj}->upper;
… …
383 } 759 }
384 760
385 $self->{chat}->append_text ($text); 761 $self->{chat}->append_text ($text);
386} 762}
387 763
388sub event_join {
389 my ($self) = @_;
390
391 $self->SUPER::event_join (@_);
392 $self->event_update_game;
393 $self->show_all;
394}
395
396sub event_part {
397 my ($self) = @_;
398
399 $self->SUPER::event_part;
400 $self->destroy;
401}
402
403sub event_move { 764sub event_move {
404 my ($self, $pass) = @_; 765 my ($self, $pass) = @_;
766
405 sound::play 1, $pass ? "pass" : "move"; 767 sound::play 1, $pass ? "pass" : "move";
406} 768}
407 769
770### GAMEPLAY EVENTS #########################################################
771
408sub event_update_game { 772sub event_resign_game {
409 my ($self) = @_;
410 $self->SUPER::event_update_game;
411
412 return unless $self->{joined};
413
414 my $title = defined $self->{channel}
415 ? $self->owner->as_string . " " . $self->opponent_string
416 : "Game Window";
417 $self->set_title("KGS Game $title");
418 $self->{title}->set_text ($title);
419
420 $self->{user}[COLOUR_BLACK] = $self->{user1};
421 $self->{user}[COLOUR_WHITE] = $self->{user2};
422
423 # show board
424 if ($self->is_inprogress) {
425 if (!$self->{boardbox}->parent) {
426 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
427 $self->{left}->add ($self->{boardbox});
428 }
429 if (my $ch = delete $self->{challenge}) {
430 (delete $_->{inlay})->clear for values %$ch;
431 }
432 }
433
434 $self->{left}->show_all;
435
436 # view text
437
438 eval { #d#
439 my @ga;
440 $ga[0] = "\nType: " . util::toxml $self->type_char;
441 $ga[1] = "\nFlags:";
442 $ga[1] .= " started" if $self->is_inprogress;
443 $ga[1] .= " adjourned" if $self->is_adjourned;
444 $ga[1] .= " scored" if $self->is_scored;
445 $ga[1] .= " saved" if $self->is_saved;
446
447 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
448 if $self->{user3}->is_inprogress;
449
450 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
451 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
452 if $self->is_inprogress;
453
454 if ($self->is_inprogress) {
455 $ga[4] = "\nHandicap: " . $self->{handicap};
456 $ga[5] = "\nKomi: " . $self->{komi};
457 $ga[6] = "\nSize: " . $self->size_string;
458 }
459
460 if ($self->is_scored) {
461 $ga[7] = "\nResult: " . $self->score_string;
462 }
463
464 $text = "\n<infoblock><header>Game Update</header>";
465 for (0..7) {
466 if ($self->{gatext}[$_] ne $ga[$_]) {
467 $text .= $ga[$_];
468 }
469 }
470 $text .= "</infoblock>";
471
472 $self->{gatext} = \@ga;
473 };
474
475 $self->{chat}->append_text ($text);
476}
477
478sub draw_rules {
479 my ($self, $inlay) = @_; 773 my ($self, $player) = @_;
480
481 my $rules = $self->{rules};
482
483 my $text = "";
484
485 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
486
487 $text .= "\nTime: ";
488
489 if ($rules->{timesys} == TIMESYS_NONE) {
490 $text .= "UNLIMITED";
491 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
492 $text .= util::format_time $rules->{time};
493 $text .= " ABS";
494 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
495 $text .= util::format_time $rules->{time};
496 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
497 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
498 $text .= util::format_time $rules->{time};
499 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
500 }
501
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;
518}
519
520sub inject_resign_game {
521 my ($self, $msg) = @_;
522 774
523 sound::play 3, "resign"; 775 sound::play 3, "resign";
524
525 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 776 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
526 . "\n<user>" 777 . "\n<user>"
527 . (util::toxml $self->{user}[$msg->{player}]->as_string) 778 . (util::toxml $self->{user}[$msg->{player}]->as_string)
528 . "</user> resigned.</infoblock>"); 779 . "</user> resigned."
780 . "\n<user>"
781 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
782 . "</user> wins the game."
783 . "</infoblock>");
784}
785
786sub event_time_win {
787 my ($self, $player) = @_;
788
789 sound::play 3, "timewin";
790 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
791 . "\n<user>"
792 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
793 . "</user> ran out of time and lost."
794 . "\n<user>"
795 . (util::toxml $self->{user}[$msg->{player}]->as_string)
796 . "</user> wins the game."
797 . "</infoblock>");
798}
799
800sub event_owner_left {
801 my ($self) = @_;
802
803 $self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
804 . "\nThe owner of this game left.</infoblock>");
805}
806
807sub event_teacher_left {
808 my ($self) = @_;
809
810 $self->{chat}->append_text ("\n<infoblock><header>Teacher left</header>"
811 . "\nThe teacher left the game.</infoblock>");
812}
813
814sub event_done {
815 my ($self) = @_;
816
817 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
818 sound::play 2, "info" unless $inlay->{count};
819 $self->{chat}->append_text ("\n<infoblock><header>Press Done</header>"
820 . "\nYour opponent pressed done. Now it's up to you.");
821 }
822 if ($self->{doneid} & 0x80000000) {
823 sound::play 2, "info" unless $inlay->{count};
824 $self->{chat}->append_text ("\n<infoblock><header>Press Done Again</header>"
825 . "\nThe board has changed.");
826 }
827
828 $self->{button_pass}->sensitive (!$self->{done}[$self->{colour}]);
829
830 $self->{chat}->set_end;
529} 831}
530 832
531sub inject_final_result { 833sub inject_final_result {
532 my ($self, $msg) = @_; 834 my ($self, $msg) = @_;
533 835
… …
536 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 838 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
537 . "</infoblock>" 839 . "</infoblock>"
538 ); 840 );
539} 841}
540 842
843sub inject_req_undo {
844 my ($self, $msg) = @_;
845
846 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
847 return if $inlay->{ignore};
848
849 sound::play 2, "warning" unless $inlay->{count};
850 $inlay->{count}++;
851
852 $inlay->clear;
853 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
854 $inlay->append_button ("Grant", sub {
855 (delete $self->{undo_inlay})->clear;
856 $self->send (grant_undo => channel => $self->{channel});
857 });
858 $inlay->append_button ("Ignore", sub {
859 $inlay->clear;
860 $inlay->{ignore} = 1;
861 # but leave inlay, so further undo requests get counted
862 });
863
864 $self->{chat}->set_end;
865}
866
867sub inject_new_game {
868 my ($self, $msg) = @_;
869
870 if ($msg->{cid} != $self->{cid}) {
871 $self->part;
872 warn "ERROR: challenge id mismatch, PLEASE REPORT, especially the circumstances (many games open? etc..)\n";#d#
873 }
874
875 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
876 delete $self->{cid};
877}
878
879### CHALLENGE HANDLING ######################################################
880
541sub draw_challenge { 881sub draw_challenge {
542 my ($self, $c) = @_; 882 my ($self, $id) = @_;
543 883
884 my $info = $self->{challenge}{$id};
544 my $inlay = $c->{inlay}; 885 my $inlay = $info->{inlay};
545 my $challenge = $c->{challenge};
546 my $rules = $challenge->{rules}; 886 my $rules = $info->{rules};
547 887
548 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name}; 888 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
549 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1}; 889 my $opponent = $as_black ? $info->{white} : $info->{black};
550 890
551 $inlay->append_text ("\n<challenge>Challenge to <user>" . $opponent->as_string . "</user></challenge>"); 891 my ($size, $time, $interval, $count, $type);
892
893 if (!$self->{channel}) {
894 $inlay->append_text ("\nNotes: ");
895 $inlay->append_widget (gtk::textentry \$info->{notes}, 20, "");
896 $inlay->append_text ("\nGlobal Offer: ");
897 $inlay->append_optionmenu (\$info->{flags},
898 0 => "No",
899 2 => "Yes",
900 );
901 } else {
902 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
903 }
904
905 $inlay->append_text ("\nType: ");
906 $type = $inlay->append_optionmenu (
907 \$info->{gametype},
908 GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
909 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
910 GAMETYPE_TEACHING , "Teaching (not yet)",
911 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
912 GAMETYPE_SIMUL , "Simul (not yet!)",
913 GAMETYPE_FREE , "Free",
914 GAMETYPE_RATED , "Rated",
915 sub {
916 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
917 },
918 );
919
920 if ($self->{channel}) {
921 $inlay->append_text ("\nMy Colour: ");
922 $inlay->append_optionmenu (
923 \$as_black,
924 0 => "White",
925 1 => "Black",
926 sub {
927 if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
928 ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
929 }
930 }
931 );
932 }
933
934 $inlay->append_text ("\nRuleset: ");
935 $inlay->append_optionmenu (
936 \$info->{rules}{ruleset},
937 RULESET_JAPANESE , "Japanese",
938 RULESET_CHINESE , "Chinese",
939 RULESET_AGA , "AGA",
940 RULESET_NEW_ZEALAND, "New Zealand",
941 );
942
943 $inlay->append_text ("\nSize: ");
944 $size = $inlay->append_optionmenu (
945 \$info->{rules}{size},
946 (9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38),
947 sub {
948 $type->set_history (5) # reset to free
949 if $_[0] != 19 && $info->{gametype} == GAMETYPE_RATED;
950 },
951 );
952
953 if ($self->{channel}) {
552 $inlay->append_text ("\nHandicap: $rules->{handicap}"); 954 $inlay->append_text ("\nHandicap: ");
955 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
553 956
554#bless( ( 957 $inlay->append_text ("\nKomi: ");
555# gametype => 3, 958 $inlay->append_widget (gtk::numentry \$info->{rules}{komi}, 5);
556# user1 => bless( { 959 }
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 960
577sub draw_users { 961 $inlay->append_text ("\nTimesys: ");
962 $inlay->append_optionmenu (
963 \$info->{rules}{timesys},
964 &TIMESYS_NONE => "None",
965 &TIMESYS_ABSOLUTE => "Absolute",
966 &TIMESYS_BYO_YOMI => "Byo Yomi",
967 &TIMESYS_CANADIAN => "Canadian",
968 sub {
969 my ($new) = @_;
970
971 if ($new eq TIMESYS_NONE) {
972 $time->hide;
973 $interval->hide;
974 $count->hide;
975 } else {
976 $time->show;
977 $time->set_text ($self->{app}{defaults}{time});
978 if ($new eq TIMESYS_ABSOLUTE) {
979 $interval->hide;
980 $count->hide;
981 } else {
982 $interval->show;
983 $count->show;
984 if ($new eq TIMESYS_BYO_YOMI) {
985 $interval->set_text ($self->{app}{defaults}{byo_time});
986 $count->set_text ($self->{app}{defaults}{byo_period});
987 } elsif ($new eq TIMESYS_CANADIAN) {
988 $interval->set_text ($self->{app}{defaults}{can_time});
989 $count->set_text ($self->{app}{defaults}{can_period});
990 }
991 }
992 }
993 }
994 );
995
996 $inlay->append_text ("\nMain Time: ");
997 $time = $inlay->append_widget (gtk::timeentry \$info->{rules}{time}, 5);
998 $inlay->append_text ("\nInterval: ");
999 $interval = $inlay->append_widget (gtk::timeentry \$info->{rules}{interval}, 5);
1000 $inlay->append_text ("\nPeriods/Stones: ");
1001 $count = $inlay->append_widget (gtk::numentry \$info->{rules}{count}, 5);
1002
1003 $inlay->append_text ("\n");
1004
1005 if (!$self->{channel}) {
1006 $inlay->append_button ("Create Challenge", sub {
1007 $inlay->clear;
1008 $self->{cid} = $self->{conn}->alloc_clientid;
1009 $self->send (new_game =>
1010 channel => delete $self->{roomid},
1011 gametype => $info->{gametype},
1012 cid => $self->{cid},
1013 flags => $info->{flags},
1014 rules => $info->{rules},
1015 notes => $info->{notes},
1016 );
1017 });
1018 } else {
1019 $inlay->append_button ("OK", sub {
1020 $inlay->clear;
1021 $self->send (challenge =>
1022 channel => $self->{channel},
1023 black => $info->{black},
1024 white => $info->{white},
1025 gametype => $info->{gametype},
1026 cid => $info->{cid},
1027 rules => $info->{rules},
1028 );
1029 });
1030 if (exists $self->{challenge}{""}) {
1031 $inlay->append_button ("Reject", sub {
1032 $inlay->clear;
1033 $self->send (reject_challenge =>
1034 channel => $self->{channel},
1035 name => $opponent->{name},
1036 gametype => $info->{gametype},
1037 cid => $info->{cid},
1038 rules => $info->{rules},
1039 );
1040 });
1041 }
1042 }
1043}
1044
1045sub new_game_challenge {
578 my ($self, $inlay) = @_; 1046 my ($self) = @_;
579 1047
580 for (sort keys %{$self->{users}}) { 1048 my $d = $self->{app}{defaults};
581 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>"); 1049
1050 $self->{challenge}{""} = {
1051 gametype => $d->{gametype},
1052 flags => 0,
1053 notes => $d->{stones},
1054 rules => {
1055 ruleset => $d->{ruleset},
1056 size => $d->{size},
1057 timesys => $d->{timesys},
1058 time => $d->{time},
1059 interval => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_time} : $d->{can_time},
1060 count => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_periods} : $d->{can_stones},
1061 },
1062
1063 inlay => $self->{chat}->new_inlay,
582 } 1064 };
1065 $self->draw_challenge ("");
583} 1066}
584 1067
585sub event_challenge { 1068sub event_challenge {
586 my ($self, $challenge) = @_; 1069 my ($self, $info) = @_;
587 1070
588 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name}; 1071 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
589 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1}; 1072 my $opponent = $as_black ? $info->{white} : $info->{black};
590 1073
591 my $c = $self->{challenge}{$opponent->{name}} ||= {}; 1074 my $id = $opponent->{name};
592 1075
593 $c->{inlay} ||= $self->{chat}->new_inlay; 1076 sound::play 2, "info";
594 $c->{challenge} = $challenge;
595 1077
1078 $self->{challenge}{$id} = $info;
1079 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
1080 exists $self->{challenge}{""}
1081 ? "Challenge from " . $opponent->as_string
1082 : "Challenge to " . $opponent->as_string,
1083 sub {
1084 $self->{challenge}{$id}{inlay} = $_[0];
596 $self->draw_challenge ($c); 1085 $self->draw_challenge ($id);
597 1086 },
598# require KGS::Listener::Debug; 1087 !exists $self->{challenge}{""} # only open when not offerer
599# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); 1088 );
600} 1089}
601 1090
6021; 10911;
603 1092

Diff Legend

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