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.56 by pcg, Thu Jun 12 23:24:53 2003 UTC vs.
Revision 1.97 by pcg, Sat May 29 06:38:27 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
52 if (!$self->{moves}) { 52 if (!$self->{moves}) {
53 util::format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
54 } else { 54 } else {
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;
190use Gtk2::GoBoard::Constants;
191
192use Glib::Object::Subclass
193 Gtk2::Window;
194
190use base KGS::Listener::Game; 195use base KGS::Listener::Game;
191use base KGS::Game; 196use base KGS::Game;
192 197
193use base gtk::widget;
194
195use POSIX qw(ceil); 198use POSIX qw(ceil);
196 199
197sub new { 200sub new {
198 my $self = shift; 201 my ($self, %arg) = @_;
199 $self = $self->SUPER::new(@_); 202 $self = $self->Glib::Object::new;
203 $self->{$_} = delete $arg{$_} for keys %arg;
200 204
201 $self->listen($self->{conn});
202
203 $self->{window} = new Gtk2::Window 'toplevel';
204 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 205 gtk::state $self, "game::window", undef, window_size => [600, 500];
205 206
206 $self->{window}->signal_connect(delete_event => sub { 207 $self->signal_connect (destroy => sub {
207 $self->part; 208 $self->unlisten;
208 $self->destroy; 209 delete $self->{app}{game}{$self->{channel}};
209 1; 210 %{$_[0]} = ();
210 }); 211 });#d#
211 212
212 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 213 $self->add (my $hpane = new Gtk2::HPaned);
213 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 214 gtk::state $hpane, "game::hpane", undef, position => 500;
214 215
215 # LEFT PANE 216 # LEFT PANE
216 217
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 218 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
218 219
219 $self->{boardbox} = new Gtk2::VBox; 220 $self->{boardbox} = new Gtk2::VBox;
220 221
221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 222 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
222 223
223 # challenge
224
225 $self->{challenge} = new challenge channel => $self->{channel};
226
227 # board box (aspect/canvas) 224 # board box (aspect/canvas)
228 225
229 $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);
230 234
231 { 235 {
232 $frame->add(my $vbox = new Gtk2::VBox); 236 $frame->add (my $vbox = new Gtk2::VBox);
233 $vbox->add($self->{title} = new Gtk2::Label $title); 237 $vbox->add ($self->{title} = new Gtk2::Label $title);
234 238
239 $vbox->add (my $hbox = new Gtk2::HBox);
240
241 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
242
235 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 0; 243 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
236 244
237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 245 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
238 $scale->set_draw_value (0); 246 $scale->set_draw_value (0);
239 $scale->set_digits (0); 247 $scale->set_digits (0);
240 248
241 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 249 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
242 } 250 }
243 251
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->{canvas} = new Gtk2::DrawingArea);
249 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
250
251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
253
254 # RIGHT PANE
255
256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1);
258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
259
260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
261 $sw->set_policy("automatic", "always");
262
263 $sw->add(($self->{userlist} = new userlist)->widget);
264
265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
266
267 $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
268 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 254 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
269 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 255 for COLOUR_WHITE, COLOUR_BLACK;
270 256
271 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 257 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
272 258
273 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 259 $self->set_channel ($self->{channel});
274 $self->{entry}->signal_connect(activate => sub {
275 my $text = $self->{entry}->get_text;
276 $self->say($text) if $text =~ /\S/;
277 $self->{entry}->set_text("");
278 });
279 260
280 $self->event_update_game; 261 $self->show_all;
262
281 $self; 263 $self;
264}
265
266sub set_channel {
267 my ($self, $channel) = @_;
268
269 $self->{channel} = $channel;
270
271 if ($self->{channel} > 0) {
272 $self->listen ($self->{conn});
273
274 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
275 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
276
277 $self->signal_connect (delete_event => sub { $self->part; 1 });
278 $self->{chat}->signal_connect (command => sub {
279 my ($chat, $cmd, $arg) = @_;
280 if ($cmd eq "rsave") {
281 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
282 } else {
283 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
284 }
285 });
286 }
282} 287}
283 288
284sub event_update_users { 289sub event_update_users {
285 my ($self, $add, $update, $remove) = @_; 290 my ($self, $add, $update, $remove) = @_;
286 291
287 $self->{userlist}->update ($add, $update, $remove); 292# $self->{userlist}->update ($add, $update, $remove);
293
294 $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
295 for @$remove;
296
297 $self->{users_inlay}->refresh;
298
299 my %important;
300 $important{$self->{user1}{name}}++;
301 $important{$self->{user2}{name}}++;
302 $important{$self->{user3}{name}}++;
303
304 if (my @users = grep $important{$_->{name}}, @$add) {
305 $self->{chat}->append_text ("\n<header>Joins:</header>");
306 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
307 }
308 if (my @users = grep $important{$_->{name}}, @$remove) {
309 $self->{chat}->append_text ("\n<header>Parts:</header>");
310 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
311 }
288} 312}
289 313
290sub join { 314sub join {
291 my ($self) = @_; 315 my ($self) = @_;
292 return if $self->{joined}; 316 return if $self->{joined};
293 317
294 $self->SUPER::join; 318 $self->SUPER::join;
295
296 $self->{window}->show_all;
297} 319}
298 320
299sub part { 321sub update_cursor {
300 my ($self) = @_; 322 my ($self) = @_;
301 323
302 $self->SUPER::part; 324 my $move = int $self->{moveadj}->get_value;
303 $self->destroy; 325 my $cb;
304}
305 326
306sub configure_event { 327 my $running = $move == @{$self->{path}}
307 my ($widget, $event, $self) = @_; 328 && $self->is_active;
308 delete $self->{stack};
309 delete $self->{pixbuf};
310 delete $self->{board_shown};
311 delete $self->{background};
312 $self->repaint_board;
313 0;
314}
315 329
316sub expose_event { 330 warn "plaiyng $self->{playing} running $running teach $self->{teacher}\n";
317 my ($widget, $event, $self) = @_; 331 warn !($self->{playing} && $running);
318 332 warn $self->{teacher} ne $self->{app}{conn};
319 $self->{pixbuf} or return; 333 if (!($self->{playing} && $running) && $self->{teacher} ne $self->{app}{conn}) {
320 334 warn "A\n";
321 my $area = $event->area; 335 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
322 336 } elsif ($self->{user1}{name} eq $self->{conn}{name}) {
323 $self->redraw ($area); 337 warn "B\n";
324 338 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_B | MARK_GRAYED);
325 0; 339 $cb = sub {
326} 340 $self->send (upd_tree =>
327 341 channel => $self->{channel},
328# something Gtk2 fixed 342 tree => $self->gen_move_tree (COLOUR_BLACK, $_[0], $_[1]),
329sub INTERP_NEAREST (){ 'nearest' }
330sub INTERP_TILES (){ 'tiles' }
331sub INTERP_BILINEAR (){ 'bilinear' }
332sub INTERP_HYPER (){ 'hyper' }
333
334sub new_pixbuf {
335 my ($w, $h, $alpha, $fill) = @_;
336
337 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
338 $pixbuf->fill ($fill) if defined $fill;
339
340 $pixbuf;
341}
342
343sub scale_pixbuf {
344 my ($src, $w, $h, $mode) = @_;
345
346 my $dst = new_pixbuf $w, $h, 1;
347
348 $src->scale(
349 $dst, 0, 0, $w, $h, 0, 0,
350 $w / $src->get_width, $h / $src->get_height,
351 $mode,
352 );
353
354 $dst;
355}
356
357# create a stack of stones
358sub create_stack {
359 my ($self, $mark, $size, $rand) = @_;
360
361 my $shadow = $size * 0.05;
362
363 my $c = \$self->{stack}{$mark};
364 unless ($$c) {
365 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
366 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
367
368 # zeroeth the shadow
369 if ($mark & (MARK_B | MARK_W)) {
370 # the -0.5's are a mystery to me
371 $::shadow_img->composite (
372 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
373 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
374 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
375 ); 343 );
376 }
377
378 # first the big stones (handicap stones could be different)
379 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
380 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
381 [MARK_GRAY_B, 128],
382 [MARK_GRAY_W, 128]) {
383 my ($mask, $alpha) = @$_;
384 if ($mark & $mask) {
385 $stone->composite (
386 $base, 0, 0, $size, $size, 0, 0,
387 $size / $stone->get_width, $size / $stone->get_height,
388 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
389 );
390 }
391 }
392
393 # then the small stones
394 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
395 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
396 my ($mask, $img) = @$_;
397 if ($mark & $mask) {
398 $img->composite (
399 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
400 $size / $img->get_width / 2, $size / $img->get_height / 2,
401 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
402 );
403 }
404 }
405
406 # and lastly any markers
407 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
408
409 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
410 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
411 [MARK_SQUARE, $::square_img[$dark_bg]]) {
412 my ($mask, $img) = @$_;
413 if ($mark & $mask) {
414 $img->composite (
415 $base, 0, 0, $size, $size, 0, 0,
416 $size / $img->get_width, $size / $img->get_height,
417 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
418 );
419 }
420 }
421
422 push @$$c, $base;
423 }
424 }
425
426 $$c->[$rand % @$$c];
427}
428
429sub pixbuf_text {
430 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
431
432 my @c = grep $_,
433 map $::font[$colour][$::fontmap{$_}],
434 split //, $text;
435
436 if (@c) {
437 my $spacing = $height * 0.1;
438 my $s = $height / List::Util::max map $_->get_height, @c;
439 my $W = List::Util::sum map $_->get_width, @c;
440
441 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
442 $y -= $height * 0.5;
443
444 for (@c) {
445 my $w = $_->get_width * $s;
446 # +2 == don't fight the rounding
447 $_->composite ($pixbuf,
448 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
449 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
450
451 $x += $w + $spacing;
452 }
453 }
454}
455
456sub pixbuf_rect {
457 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
458 # we fake lines by... a horrible method :/
459 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
460 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
461 INTERP_NEAREST, $alpha);
462}
463
464sub repaint_board {
465 my ($self) = @_;
466 my $canvas = $self->{canvas};
467 my $expose_area = undef;
468
469 return $expose_area unless $self->{board};
470
471 my ($w, $h) = ($canvas->allocation->values)[2,3];
472
473 die "FATAL: board aspect ratio != 1" unless $w == $h;
474
475 my $s = $w;
476
477 return unless $s >= 200;
478
479 my $size = $self->{size};
480
481 # we leave enough space for the shadows.. I like smaller stones, and we
482 # do no need to do the nifty recursive screen updates that goban2 does
483 my $border = int ($s / ($size + 3) * 0.5);
484 my $s2 = $s - $border * 2;
485 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
486 my $ofs = int ($edge / 2);
487
488 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
489
490 my $pixbuf;
491
492 my $oldboard;
493
494 if ($self->{background}) {
495 if ($oldboard = $self->{board_shown}) {
496 $pixbuf = $self->{pixbuf};
497 } else {
498 $pixbuf = $self->{background}->copy;
499 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
500 }
501 } else {
502 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
503
504 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
505
506 if ($s < $bw && $s < $bh) {
507 $pixbuf = new_pixbuf $s, $s, 0;
508 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
509 } else {
510 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
511 }
512
513 my $linew = int ($s / 40 / $size);
514
515 # ornamental border... we have time to waste :/
516 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
517 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
518 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
519 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
520
521 for my $i (1 .. $size) {
522 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
523 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
524
525 # 38 max, but we allow a bit more
526 my $label = (qw(- A B C D E F G H J K L M N O P Q R S T U V W X Y Z
527 AA BB CC DD EE FF GG HH JJ KK LL MM NN OO PP QQ RR SS TT UU VV WW XX YY ZZ))[$i];
528
529 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
530 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
531 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
532 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
533
534 $a++;
535 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
536 }
537
538 # hoshi points
539 my $hoshi = sub {
540 my ($x, $y) = @_;
541 my $hs = int ($edge / 4) | 1;
542 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
543
544 # we use the shadow mask... not perfect, but I want to finish this
545 $::shadow_img->composite ($pixbuf,
546 $x, $y, $hs + 1, $hs + 1, $x, $y,
547 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
548 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
549 }; 344 };
550 345 } elsif ($self->{user2}{name} eq $self->{conn}{name}) {
551 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset 346 warn "C\n";
552 $hoshi->($h1, $h1); 347 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_W | MARK_GRAYED);
553 $hoshi->($size - $h1 + 1, $h1); 348 $cb = sub {
554 $hoshi->($h1, $size - $h1 + 1); 349 $self->send (upd_tree =>
555 $hoshi->($size - $h1 + 1, $size - $h1 + 1); 350 channel => $self->{channel},
556 351 tree => $self->gen_move_tree (COLOUR_WHITE, $_[0], $_[1]),
557 if ($size % 2) { # on odd boards, also the remaining 5
558 my $h2 = ($size + 1) / 2;
559 if ($size > 10) {
560 $hoshi->($h1, $h2);
561 $hoshi->($size - $h1 + 1, $h2);
562 $hoshi->($h2, $size - $h1 + 1);
563 $hoshi->($h2, $h1);
564 } 352 );
565 # the tengen
566 $hoshi->($h2, $h2);
567 } 353 };
568
569 unless ($::config->{conserve_memory} > 1) {
570 $self->{background} = $pixbuf;
571 $pixbuf = $pixbuf->copy;
572 }
573 } 354 }
574 355
575 $self->{pixbuf} = $pixbuf; 356 $self->{board_click} = $cb;
576
577 for my $x (1 .. $size) {
578 for my $y (1 .. $size) {
579 my $rand = ($x ^ $y ^ 0x5555);
580
581 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
582
583 if ($::config->{randomize}) {
584 $dx += ($rand % 7) - 3;
585 $dy += ($rand / 3 % 7) - 3;
586 }
587
588 my $shadow = $edge * 0.05;
589 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
590
591 my $mark = $self->{board}{board}[$x-1][$y-1];
592 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
593
594 if ($oldboard) {
595 next if $old == $mark; # no change
596
597 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
598 $expose_area = $expose_area
599 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
600 : new Gtk2::Gdk::Rectangle @$area;
601 }
602
603 if ($mark) {
604 my $pb = $self->create_stack($mark, $edge, $rand);
605
606 $pb->composite ($pixbuf, @$area,
607 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
608
609 # labels are handled here because they are quite rare
610 if ($mark & MARK_LABEL) {
611 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
612
613 if ($white) {
614 pixbuf_text $pixbuf, 0,
615 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
616 $self->{board}{label}[$x-1][$y-1];
617 }
618 pixbuf_text $pixbuf, $white,
619 $k[$x], $k[$y], $ofs * 0.7,
620 $self->{board}{label}[$x-1][$y-1];
621 }
622 }
623 }
624 }
625
626 $self->{board_shown} = Storable::dclone $self->{board};
627 #d# save
628 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
629
630 $expose_area;
631}
632
633sub redraw {
634 my ($self, $area) = @_;
635
636 if ($area && $self->{pixbuf}) {
637 my ($x, $y, $w, $h) = $area->values;
638
639 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
640 $x, $y, $x, $y, $w, $h,
641 "normal", 0, 0);
642 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
643 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
644 }
645} 357}
646 358
647sub update_board { 359sub update_board {
648 my ($self) = @_; 360 my ($self) = @_;
649 return unless $self->{path}; 361 return unless $self->{path};
650 362
651 #$self->{update_board_cb} ||= add Glib::Idle sub {
652 my $move = int $self->{moveadj}->get_value; 363 my $move = int $self->{moveadj}->get_value;
653 364
654 my $running = $move == @{$self->{path}}; 365 my $running = $move == @{$self->{path}}
366 && !$self->{teacher}
367 && $self->is_active;
655 368
656 $self->{board_label}->set_text ("Move " . ($move - 1)); 369 $self->{board_label}->set_text ("Move " . ($move - 1));
657 370
658 $self->{board} = new KGS::Game::Board $self->{size}; 371 $self->{cur_board} = new KGS::Game::Board $self->{size};
659 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 372 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
660 373
661 for my $colour (WHITE, BLACK) { 374 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
662 $self->{userpanel}[$colour]->set_state ( 375 $self->{userpanel}[$colour]->set_state (
663 $self->{board}{captures}[$colour], 376 $self->{cur_board}{captures}[$colour],
664 $self->{board}{timer}[$colour], 377 $self->{cur_board}{timer}[$colour],
665 ($running && $self->{lastmove_colour} == !$colour) 378 ($running && $self->{lastmove_colour} == !$colour)
666 ? $self->{lastmove_time} : 0 379 ? $self->{lastmove_time} : 0
667 ); 380 );
668 }
669
670 $self->redraw ($self->repaint_board);
671
672 # delete $self->{update_board_cb};
673 #} 381 }
382
383 $self->{board}->set_board ($self->{cur_board});
384
385 $self->update_cursor;
674} 386}
675 387
676sub event_update_tree { 388sub event_update_tree {
677 my ($self) = @_; 389 my ($self) = @_;
678 390
725 }sgexi; 437 }sgexi;
726 438
727 $text .= $_; 439 $text .= $_;
728 } 440 }
729 441
730 $self->{text}->append_text ($text); 442 $self->{chat}->append_text ($text);
731} 443}
732 444
733sub event_join { 445sub event_join {
734 my ($self) = @_; 446 my ($self) = @_;
447
735 $self->SUPER::event_join; 448 $self->SUPER::event_join (@_);
449 $self->init_tree;
450 $self->event_update_game;
736} 451}
737 452
738sub event_part { 453sub event_part {
739 my ($self) = @_; 454 my ($self) = @_;
455
740 $self->SUPER::event_part; 456 $self->SUPER::event_part;
741 $self->destroy; 457 $self->destroy;
742} 458}
743 459
744sub event_move { 460sub event_move {
746 sound::play 1, $pass ? "pass" : "move"; 462 sound::play 1, $pass ? "pass" : "move";
747} 463}
748 464
749sub event_update_game { 465sub event_update_game {
750 my ($self) = @_; 466 my ($self) = @_;
467
751 $self->SUPER::event_update_game; 468 $self->SUPER::event_update_game;
752 469
753 my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window"; 470 return unless $self->{joined};
471
472 $self->{playing} = $self->{teacher} eq $self->{conn}{name}
473 || $self->is_playing ($self->{conn}{name});
474
475 my $title = defined $self->{channel}
476 ? $self->owner->as_string . " " . $self->opponent_string
477 : "Game Window";
754 $self->{window}->set_title("KGS Game $title"); 478 $self->set_title("KGS Game $title");
755 $self->{title}->set_text ($title); 479 $self->{title}->set_text ($title);
756 480
757 $self->{user}[BLACK] = $self->{user1}; 481 $self->{user}[COLOUR_BLACK] = $self->{user1};
758 $self->{user}[WHITE] = $self->{user2}; 482 $self->{user}[COLOUR_WHITE] = $self->{user2};
759 483
760 # show board 484 # show board
485 if ($self->is_inprogress) {
486 if (!$self->{boardbox}->parent) {
487 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
488 $self->{left}->add ($self->{boardbox});
489 $self->{board}->signal_connect (button_release => sub {
490 warn "XXX @_\n";#d#
491 if ($_[1] == 1) {
492 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
493 }
494 });
495 }
496 if (my $ch = delete $self->{challenge}) {
497 (delete $_->{inlay})->destroy for values %$ch;
498 }
499 $self->update_cursor;
500 }
501
502 $self->{left}->show_all;
503
504 $self->{rules_inlay}->refresh;
761 505
762 $self->{left}->remove ($_) for $self->{left}->get_children; 506}
763 if ($self->is_valid) {
764 $self->{left}->add ($self->{boardbox});
765 (delete $self->{challenge})->destroy if $self->{challenge};
766 } else {
767 $self->{left}->add ($self->{challenge}->widget);
768 }
769 $self->{left}->show_all;
770 507
771 # view text 508sub draw_setup {
772 509 my ($self, $inlay) = @_;
773 my @ga;
774 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
775 . " (" . (util::toxml $gameopt{$self->option}) . ")";
776 $ga[1] = "\nFlags:";
777 $ga[1] .= " valid" if $self->is_valid;
778 $ga[1] .= " adjourned" if $self->is_adjourned;
779 $ga[1] .= " scored" if $self->is_scored;
780 $ga[1] .= " saved" if $self->is_saved;
781 510
511 return unless $self->{joined};
512
513 my $rules = $self->{rules};
514
515 my $text = "";
516
517 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
518 if $self->{teacher};
519
782 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 520 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
521 if $self->{user3}->is_valid;
783 522
523 if ($self->is_inprogress) {
784 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 524 $text .= "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
785 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 525 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
786 if $self->is_valid;
787
788 if ($self->is_valid) {
789 $ga[4] = "\nHandicap: " . $self->{handicap};
790 $ga[5] = "\nKomi: " . $self->{komi};
791 $ga[6] = "\nSize: " . $self->size_string;
792 }
793
794 if ($self->is_scored) {
795 $ga[7] = "\nResult: " . $self->score_string;
796 }
797
798 $text = "\n<infoblock><header>Game Update</header>";
799 for (0..7) {
800 if ($self->{gatext}[$_] ne $ga[$_]) {
801 $text .= $ga[$_];
802 }
803 }
804 $text .= "</infoblock>";
805
806 $self->{gatext} = \@ga;
807 526 }
808 $self->{text}->append_text ($text); 527 $text .= "\nType: " . util::toxml $gametype{$self->type};
809}
810
811sub event_update_rules {
812 my ($self, $rules) = @_;
813
814 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
815 for BLACK, WHITE;
816
817 sound::play 3, "gamestart";
818
819 my $text = "\n<header>Game Rules</header>";
820 528
821 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 529 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
822 530
823 $text .= "\nTime: "; 531 $text .= "\nTime: ";
824 532
826 $text .= "UNLIMITED"; 534 $text .= "UNLIMITED";
827 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 535 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
828 $text .= util::format_time $rules->{time}; 536 $text .= util::format_time $rules->{time};
829 $text .= " ABS"; 537 $text .= " ABS";
830 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 538 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
831 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 539 $text .= util::format_time $rules->{time};
832 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; 540 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
833 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 541 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
834 $text .= util::format_time $rules->{time}; 542 $text .= util::format_time $rules->{time};
835 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 543 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
836 } 544 }
837 545
546 $text .= "\nFlags:";
547 $text .= " private" if $self->is_private;
548 $text .= " started" if $self->is_inprogress;
549 $text .= " adjourned" if $self->is_adjourned;
550 $text .= " scored" if $self->is_scored;
551 $text .= " saved" if $self->is_saved;
552
553 if ($self->is_inprogress) {
554 $text .= "\nHandicap: " . $self->{handicap};
555 $text .= "\nKomi: " . $self->{komi};
556 $text .= "\nSize: " . $self->size_string;
557 }
558
559 if ($self->is_scored) {
560 $text .= "\nResult: " . $self->score_string;
561 }
562
838 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 563 $inlay->append_text ("<infoblock>$text</infoblock>");
564
565}
566
567sub event_update_rules {
568 my ($self, $rules) = @_;
569
570 $self->{rules} = $rules;
571
572 if ($self->{user}) {
573 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
574 for COLOUR_BLACK, COLOUR_WHITE;
575 }
576
577 sound::play 3, "gamestart";
578
579 $self->{rules_inlay}->refresh;
839} 580}
840 581
841sub inject_resign_game { 582sub inject_resign_game {
842 my ($self, $msg) = @_; 583 my ($self, $msg) = @_;
843 584
844 sound::play 3, "resign"; 585 sound::play 3, "resign";
845 586
846 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 587 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
847 . "\n<user>" 588 . "\n<user>"
848 . (util::toxml $self->{user}[$msg->{player}]->as_string) 589 . (util::toxml $self->{user}[$msg->{player}]->as_string)
849 . "</user> resigned.</infoblock>"); 590 . "</user> resigned.</infoblock>");
850} 591}
851 592
852sub inject_final_result { 593sub inject_final_result {
853 my ($self, $msg) = @_; 594 my ($self, $msg) = @_;
854 595
855 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 596 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
856 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 597 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
857 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 598 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
858 . "</infoblock>" 599 . "</infoblock>"
859 ); 600 );
860} 601}
861 602
862sub destroy { 603sub inject_new_game {
604 my ($self, $msg) = @_;
605
606 $self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>");
607 delete $self->{cid};
608}
609
610sub draw_challenge {
863 my ($self) = @_; 611 my ($self, $id) = @_;
864 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 612
865 for BLACK, WHITE; 613 my $challenge = $self->{challenge}{$id};
866 $self->SUPER::destroy; 614
867 delete $appwin::gamelist->{game}{$self->{channel}}; 615 my $inlay = $challenge->{inlay};
616 my $rules = $challenge->{rules};
617
618 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name} ? 1 : 0;;
619 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
620
621 my ($size, $time, $interval, $count);
622
623 if (!$self->{channel}) {
624 $inlay->append_text ("\nNotes: ");
625 $inlay->append_entry (\$channel->{notes}, 20, "");
626 $inlay->append_text ("\nGlobal Offer: ");
627 $inlay->append_optionmenu (\$challenge->{flags},
628 0 => "No",
629 2 => "Yes",
630 );
631 } else {
632 $inlay->append_text ("\nNotes: " . util::toxml $channel->{notes});
633 }
634
635 $inlay->append_text ("\nType: ");
636 $inlay->append_optionmenu (
637 \$challenge->{type},
638 GAMETYPE_DEMONSTRATION , "Demonstration",
639 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)",
640 GAMETYPE_TEACHING , "Teaching",
641 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)",
642 GAMETYPE_SIMUL , "Simul (not yet!)",
643 GAMETYPE_FREE , "Free",
644 GAMETYPE_RATED , "Rated",
645 sub {
646 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
647 },
648 );
649
650 if ($self->{channel}) {
651 $inlay->append_text ("\nMy Colour: ");
652 $inlay->append_optionmenu (
653 \$as_black,
654 0 => "White",
655 1 => "Black",
656 sub {
657 if ($challenge->{$_[0] ? "user1" : "user2"}{name} ne $self->{conn}{name}) {
658 ($challenge->{user1}, $challenge->{user2}) = ($challenge->{user2}, $challenge->{user1});
659 }
660 }
661 );
662 }
663
664 $inlay->append_text ("\nRuleset: ");
665 $inlay->append_optionmenu (
666 \$challenge->{rules}{ruleset},
667 RULESET_JAPANESE , "Japanese",
668 RULESET_CHINESE , "Chinese",
669 RULESET_AGA , "AGA",
670 RULESET_NEW_ZEALAND, "New Zealand",
671 );
672
673 $inlay->append_text ("\nSize: ");
674 $size = $inlay->append_optionmenu (
675 \$challenge->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38
676 );
677
678 if ($self->{channel}) {
679 $inlay->append_text ("\nHandicap: ");
680 $inlay->append_optionmenu (\$challenge->{rules}{handicap}, map +($_, $_), 0..9);
681
682 $inlay->append_text ("\nKomi: ");
683 $inlay->append_entry (\$challenge->{rules}{komi}, 5);
684 }
685
686 $inlay->append_text ("\nTimesys: ");
687 $inlay->append_optionmenu (
688 \$challenge->{rules}{timesys},
689 &TIMESYS_NONE => "None",
690 &TIMESYS_ABSOLUTE => "Absolute",
691 &TIMESYS_BYO_YOMI => "Byo Yomi",
692 &TIMESYS_CANADIAN => "Canadian",
693 sub {
694 my ($new) = @_;
695
696 if ($new eq TIMESYS_NONE) {
697 $time->hide;
698 $interval->hide;
699 $count->hide;
700 } else {
701 $time->show;
702 $time->set_text ($self->{app}{defaults}{time});
703 if ($new eq TIMESYS_ABSOLUTE) {
704 $interval->hide;
705 $count->hide;
706 } else {
707 $interval->show;
708 $count->show;
709 if ($new eq TIMESYS_BYO_YOMI) {
710 $interval->set_text ($self->{app}{defaults}{byo_time});
711 $count->set_text ($self->{app}{defaults}{byo_period});
712 } elsif ($new eq TIMESYS_CANADIAN) {
713 $interval->set_text ($self->{app}{defaults}{can_time});
714 $count->set_text ($self->{app}{defaults}{can_period});
715 }
716 }
717 }
718 }
719 );
720
721 $inlay->append_text ("\nMain Time: ");
722 $time = $inlay->append_entry (\$challenge->{rules}{time}, 5);
723 $inlay->append_text ("\nInterval: ");
724 $interval = $inlay->append_entry (\$challenge->{rules}{interval}, 3);
725 $inlay->append_text ("\nPeriods/Stones: ");
726 $count = $inlay->append_entry (\$challenge->{rules}{count}, 2);
727
728 $inlay->append_text ("\n");
729
730 if (!$self->{channel}) {
731 $inlay->append_button ("Create Challenge", sub {
732 $inlay->clear;
733 $self->{cid} = $self->{conn}->alloc_clientid;
734 $self->send (new_game =>
735 channel => delete $self->{roomid},
736 cid => $self->{cid},
737 type => $challenge->{type},
738 flags => $challenge->{flags},
739 rules => $challenge->{rules},
740 notes => $challenge->{notes},
741 );
742 });
743 } else {
744 $inlay->append_button ("OK", sub {
745 $inlay->clear;
746 $self->send (challenge =>
747 channel => $self->{channel},
748 challenge => $challenge,
749 );
750 });
751 if (exists $self->{challenge}{""}) {
752 $inlay->append_button ("Reject", sub {
753 $inlay->clear;
754 $self->send (reject_challenge =>
755 channel => $self->{channel},
756 name => $opponent->{name},
757 );
758 });
759 }
760 }
761}
762
763sub draw_users {
764 my ($self, $inlay) = @_;
765
766 for (sort keys %{$self->{users}}) {
767 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
768 }
769}
770
771sub event_challenge {
772 my ($self, $challenge) = @_;
773
774 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
775 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
776
777 my $id = $opponent->{name};
778
779 $self->{challenge}{$id} = $challenge;
780 $self->{chat}->new_switchable_inlay (
781 exists $self->{challenge}{""} ? "Challenge from $opponent->{name}" : "Challenge to $opponent->{name}",
782 sub {
783 $self->{challenge}{$id}{inlay} = $_[0];
784 $self->draw_challenge ($id);
785 },
786 !exists $self->{challenge}{""} # only open when not offerer
787 );
868} 788}
869 789
8701; 7901;
871 791

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines