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.60 by pcg, Wed Jun 18 00:24:30 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
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 { 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}
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;
256
257 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
258
259 #$buttonbox->I#
270 260
271 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 261 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
272 262
273 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 263 $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 264
280 $self->event_update_game; 265 $self->show_all;
266
281 $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 }
282} 291}
283 292
284sub event_update_users { 293sub event_update_users {
285 my ($self, $add, $update, $remove) = @_; 294 my ($self, $add, $update, $remove) = @_;
286 295
287 $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;
288 302
289 my %important; 303 my %important;
304 $important{$self->{black}{name}}++;
305 $important{$self->{white}{name}}++;
290 $important{$self->{user1}{name}}++; 306 $important{$self->{owner}{name}}++;
291 $important{$self->{user2}{name}}++;
292 $important{$self->{user3}{name}}++;
293 307
294 if (my @users = grep $important{$_->{name}}, @$add) { 308 if (my @users = grep $important{$_->{name}}, @$add) {
295 $self->{text}->append_text ("\n<header>Joins:</header>"); 309 $self->{chat}->append_text ("\n<header>Joins:</header>");
296 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 310 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
297 } 311 }
298 if (my @users = grep $important{$_->{name}}, @$remove) { 312 if (my @users = grep $important{$_->{name}}, @$remove) {
299 $self->{text}->append_text ("\n<header>Parts:</header>"); 313 $self->{chat}->append_text ("\n<header>Parts:</header>");
300 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 314 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
301 } 315 }
302
303} 316}
304 317
305sub join { 318sub join {
306 my ($self) = @_; 319 my ($self) = @_;
307 return if $self->{joined}; 320 return if $self->{joined};
308 321
309 $self->SUPER::join; 322 $self->SUPER::join;
310
311 $self->{window}->show_all;
312} 323}
313 324
314sub part { 325sub update_cursor {
315 my ($self) = @_; 326 my ($self) = @_;
316 327
317 $self->SUPER::part; 328 my $move = int $self->{moveadj}->get_value;
318 $self->destroy; 329 my $cb;
319}
320 330
321sub configure_event { 331 warn sprintf "move %d spath %d\n", $move, scalar @{$self->{path}};#d#
322 my ($widget, $event, $self) = @_; 332 warn "isact " . $self->is_active;#d#
323 delete $self->{stack}; 333 warn "flags $self->{flags}\n";#d#
324 delete $self->{pixbuf}; 334 warn "handi $self->{handicap}\n";#d#
335
336 my $running = $move == @{$self->{path}}; # && $self->is_active;
337
325 delete $self->{board_shown}; 338 delete $self->{board_click};
326 delete $self->{background};
327 $self->repaint_board;
328 0;
329}
330 339
331sub expose_event { 340 warn "plaiyng $self->{playing} running $running last $self->{cur_board}{last}\n";#d#
332 my ($widget, $event, $self) = @_; 341 if ($self->{teacher} eq $self->{app}{conn}) {
333 342 #TODO# # teaching mode not implemented
334 $self->{pixbuf} or return; 343 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
335 344 } elsif (!$self->{playing} || !$running) {
336 $self->redraw ($event->area->values); 345 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
337 346 #TODO# # implement coordinate-grabbing
338 0; 347 } elsif ($self->{black}{name} eq $self->{conn}{name} && $self->{cur_board}{last} == COLOUR_WHITE) {
339} 348 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_B | MARK_GRAYED);
340 349 $self->{board_click} = sub {
341# something Gtk2 fixed 350 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
342sub INTERP_NEAREST (){ 'nearest' } 351 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
343sub INTERP_TILES (){ 'tiles' } 352 delete $self->{board_click};
344sub INTERP_BILINEAR (){ 'bilinear' }
345sub INTERP_HYPER (){ 'hyper' }
346
347sub new_pixbuf {
348 my ($w, $h, $alpha, $fill) = @_;
349
350 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
351 $pixbuf->fill ($fill) if defined $fill;
352
353 $pixbuf;
354}
355
356sub scale_pixbuf {
357 my ($src, $w, $h, $mode) = @_;
358
359 my $dst = new_pixbuf $w, $h, 1;
360
361 $src->scale(
362 $dst, 0, 0, $w, $h, 0, 0,
363 $w / $src->get_width, $h / $src->get_height,
364 $mode,
365 );
366
367 $dst;
368}
369
370# create a stack of stones
371sub create_stack {
372 my ($self, $mark, $size, $rand) = @_;
373
374 my $shadow = $size * 0.05;
375
376 my $c = \$self->{stack}{$mark};
377 unless ($$c) {
378 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
379 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
380
381 # zeroeth the shadow
382 if ($mark & (MARK_B | MARK_W)) {
383 # the -0.5's are a mystery to me
384 $::shadow_img->composite (
385 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
386 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
387 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
388 );
389 }
390
391 # first the big stones (handicap stones could be different)
392 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
393 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
394 [MARK_GRAY_B, 128],
395 [MARK_GRAY_W, 128]) {
396 my ($mask, $alpha) = @$_;
397 if ($mark & $mask) {
398 $stone->composite (
399 $base, 0, 0, $size, $size, 0, 0,
400 $size / $stone->get_width, $size / $stone->get_height,
401 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
402 );
403 }
404 }
405
406 # then the small stones
407 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
408 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
409 my ($mask, $img) = @$_;
410 if ($mark & $mask) {
411 $img->composite (
412 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
413 $size / $img->get_width / 2, $size / $img->get_height / 2,
414 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
415 );
416 }
417 }
418
419 # and lastly any markers
420 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
421
422 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
423 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
424 [MARK_SQUARE, $::square_img[$dark_bg]]) {
425 my ($mask, $img) = @$_;
426 if ($mark & $mask) {
427 $img->composite (
428 $base, 0, 0, $size, $size, 0, 0,
429 $size / $img->get_width, $size / $img->get_height,
430 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
431 );
432 }
433 }
434
435 push @$$c, $base;
436 }
437 }
438
439 $$c->[$rand % @$$c];
440}
441
442sub pixbuf_text {
443 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
444
445 my @c = grep $_,
446 map $::font[$colour][$::fontmap{$_}],
447 split //, $text;
448
449 if (@c) {
450 my $spacing = $height * 0.1;
451 my $s = $height / List::Util::max map $_->get_height, @c;
452 my $W = List::Util::sum map $_->get_width, @c;
453
454 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
455 $y -= $height * 0.5;
456
457 for (@c) {
458 my $w = $_->get_width * $s;
459 # +2 == don't fight the rounding
460 $_->composite ($pixbuf,
461 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
462 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
463
464 $x += $w + $spacing;
465 }
466 }
467}
468
469sub pixbuf_rect {
470 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
471 # we fake lines by... a horrible method :/
472 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
473 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
474 INTERP_NEAREST, $alpha);
475}
476
477sub repaint_board {
478 my ($self) = @_;
479 my $canvas = $self->{canvas};
480
481 return unless $self->{board};
482
483 my ($w, $h) = ($canvas->allocation->values)[2,3];
484
485 die "FATAL: board aspect ratio != 1" unless $w == $h;
486
487 my $s = $w;
488
489 return unless $s >= 200;
490
491 my $size = $self->{size};
492
493 # we leave enough space for the shadows.. I like smaller stones, and we
494 # do no need to do the nifty recursive screen updates that goban2 does
495 my $border = int ($s / ($size + 3) * 0.5);
496 my $s2 = $s - $border * 2;
497 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
498 my $ofs = int ($edge / 2);
499
500 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
501
502 my $pixbuf;
503
504 my $oldboard;
505
506 if ($self->{background}) {
507 if ($oldboard = $self->{board_shown}) {
508 $pixbuf = $self->{pixbuf};
509 } else {
510 $pixbuf = $self->{background}->copy;
511 $self->{canvas}->queue_draw_area (0, 0, $s, $s);
512 }
513 } else {
514 $self->{canvas}->queue_draw_area (0, 0, $s, $s);
515
516 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
517
518 if ($s < $bw && $s < $bh) {
519 $pixbuf = new_pixbuf $s, $s, 0;
520 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
521 } else {
522 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
523 }
524
525 my $linew = int ($s / 40 / $size);
526
527 # ornamental border... we have time to waste :/
528 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
529 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
530 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
531 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
532
533 for my $i (1 .. $size) {
534 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
535 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
536
537 # 38 max, but we allow a bit more
538 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
539 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];
540
541 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
542 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
543 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
544 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
545
546 $a++;
547 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
548 }
549
550 # hoshi points
551 my $hoshi = sub {
552 my ($x, $y) = @_;
553 my $hs = int ($edge / 4) | 1;
554 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
555
556 # we use the shadow mask... not perfect, but I want to finish this
557 $::shadow_img->composite ($pixbuf,
558 $x, $y, $hs + 1, $hs + 1, $x, $y,
559 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
560 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
561 }; 353 };
562 354 } elsif ($self->{white}{name} eq $self->{conn}{name} && $self->{cur_board}{last} == COLOUR_BLACK) {
563 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset 355 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_W | MARK_GRAYED);
564 $hoshi->($h1, $h1); 356 $self->{board_click} = sub {
565 $hoshi->($size - $h1 + 1, $h1); 357 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
566 $hoshi->($h1, $size - $h1 + 1); 358 $self->{board}->set (cursor_mask => 0, cursor_value => 0);
567 $hoshi->($size - $h1 + 1, $size - $h1 + 1); 359 delete $self->{board_click};
568
569 if ($size % 2) { # on odd boards, also the remaining 5
570 my $h2 = ($size + 1) / 2;
571 if ($size > 10) {
572 $hoshi->($h1, $h2);
573 $hoshi->($size - $h1 + 1, $h2);
574 $hoshi->($h2, $size - $h1 + 1);
575 $hoshi->($h2, $h1);
576 }
577 # the tengen
578 $hoshi->($h2, $h2);
579 } 360 };
580
581 unless ($::config->{conserve_memory} > 1) {
582 $self->{background} = $pixbuf;
583 $pixbuf = $pixbuf->copy;
584 }
585 }
586
587 $self->{pixbuf} = $pixbuf;
588
589 for my $x (1 .. $size) {
590 for my $y (1 .. $size) {
591 my $rand = ($x ^ $y ^ 0x5555);
592
593 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
594
595 if ($::config->{randomize}) {
596 $dx += ($rand % 7) - 3;
597 $dy += ($rand / 3 % 7) - 3;
598 }
599
600 my $shadow = $edge * 0.05;
601 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
602
603 my $mark = $self->{board}{board}[$x-1][$y-1];
604 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
605
606 if ($oldboard) {
607 next if $old == $mark; # no change
608
609 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
610 }
611
612 if ($mark) {
613 my $pb = $self->create_stack($mark, $edge, $rand);
614
615 $pb->composite ($pixbuf, @$area,
616 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
617
618 # labels are handled here because they are quite rare
619 if ($mark & MARK_LABEL) {
620 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
621
622 if ($white) {
623 pixbuf_text $pixbuf, 0,
624 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
625 $self->{board}{label}[$x-1][$y-1];
626 }
627 pixbuf_text $pixbuf, $white,
628 $k[$x], $k[$y], $ofs * 0.7,
629 $self->{board}{label}[$x-1][$y-1];
630 }
631 }
632
633 if ($oldboard) {
634 $self->redraw (@$area);
635 }
636 }
637 }
638
639 $self->{board_shown} = Storable::dclone $self->{board};
640}
641
642sub redraw {
643 my ($self, $x, $y, $w, $h) = @_;
644
645 if ($self->{pixbuf}) {
646 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
647 $x, $y, $x, $y, $w, $h,
648 "normal", 0, 0);
649 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
650 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
651 } 361 }
652} 362}
653 363
654sub update_board { 364sub update_board {
655 my ($self) = @_; 365 my ($self) = @_;
656 return unless $self->{path}; 366 return unless $self->{path};
657 367
658 my $move = int $self->{moveadj}->get_value; 368 my $move = int $self->{moveadj}->get_value;
659 369
660 my $running = $move == @{$self->{path}}; 370 my $running = $move == @{$self->{path}} && !$self->{teacher};
661 371
662 $self->{board_label}->set_text ("Move " . ($move - 1)); 372 $self->{board_label}->set_text ("Move " . ($move - 1));
663 373
664 $self->{board} = new KGS::Game::Board $self->{size}; 374 $self->{cur_board} = new KGS::Game::Board $self->{size};
665 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 375 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
666 376
667 for my $colour (WHITE, BLACK) { 377 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
668 $self->{userpanel}[$colour]->set_state ( 378 $self->{userpanel}[$colour]->set_state (
669 $self->{board}{captures}[$colour], 379 $self->{cur_board}{captures}[$colour],
670 $self->{board}{timer}[$colour], 380 $self->{cur_board}{timer}[$colour],
671 ($running && $self->{lastmove_colour} == !$colour) 381 ($running && $self->{lastmove_colour} == !$colour)
672 ? $self->{lastmove_time} : 0 382 ? $self->{lastmove_time} : 0
673 ); 383 );
674 } 384 }
675 385
676 $self->repaint_board; 386 $self->{board}->set_board ($self->{cur_board});
387
388 $self->update_cursor;
677} 389}
678 390
679sub event_update_tree { 391sub event_update_tree {
680 my ($self) = @_; 392 my ($self) = @_;
681 393
728 }sgexi; 440 }sgexi;
729 441
730 $text .= $_; 442 $text .= $_;
731 } 443 }
732 444
733 $self->{text}->append_text ($text); 445 $self->{chat}->append_text ($text);
734} 446}
735 447
736sub event_join { 448sub event_join {
737 my ($self) = @_; 449 my ($self) = @_;
450
738 $self->SUPER::event_join; 451 $self->SUPER::event_join (@_);
452 $self->init_tree;
453 $self->event_update_game;
739} 454}
740 455
741sub event_part { 456sub event_part {
742 my ($self) = @_; 457 my ($self) = @_;
458
743 $self->SUPER::event_part; 459 $self->SUPER::event_part;
744 $self->destroy; 460 $self->destroy;
745} 461}
746 462
747sub event_move { 463sub event_move {
748 my ($self, $pass) = @_; 464 my ($self, $pass) = @_;
749 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 }
750} 470}
751 471
752sub event_update_game { 472sub event_update_game {
753 my ($self) = @_; 473 my ($self) = @_;
474
754 $self->SUPER::event_update_game; 475 $self->SUPER::event_update_game;
755 476
756 my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window"; 477 return unless $self->{joined};
478
479 $self->{playing} = $self->{teacher} eq $self->{conn}{name}
480 || $self->is_playing ($self->{conn}{name});
481
482 my $title = defined $self->{channel}
483 ? $self->owner->as_string . " " . $self->opponent_string
484 : "Game Window";
757 $self->{window}->set_title("KGS Game $title"); 485 $self->set_title("KGS Game $title");
758 $self->{title}->set_text ($title); 486 $self->{title}->set_text ($title);
759 487
760 $self->{user}[BLACK] = $self->{user1}; 488 $self->{user}[COLOUR_BLACK] = $self->{black};
761 $self->{user}[WHITE] = $self->{user2}; 489 $self->{user}[COLOUR_WHITE] = $self->{white};
762 490
763 # 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;
764 511
765 $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
766 if ($self->is_valid) { 529 if ($self->is_inprogress) {
767 $self->{left}->add ($self->{boardbox});
768 (delete $self->{challenge})->destroy if $self->{challenge};
769 } else {
770 $self->{left}->add ($self->{challenge}->widget);
771 }
772 $self->{left}->show_all;
773
774 # view text
775
776 my @ga;
777 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
778 . " (" . (util::toxml $gameopt{$self->option}) . ")";
779 $ga[1] = "\nFlags:";
780 $ga[1] .= " valid" if $self->is_valid;
781 $ga[1] .= " adjourned" if $self->is_adjourned;
782 $ga[1] .= " scored" if $self->is_scored;
783 $ga[1] .= " saved" if $self->is_saved;
784
785 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
786
787 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 530 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
788 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 531 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
789 if $self->is_valid;
790
791 if ($self->is_valid) {
792 $ga[4] = "\nHandicap: " . $self->{handicap};
793 $ga[5] = "\nKomi: " . $self->{komi};
794 $ga[6] = "\nSize: " . $self->size_string;
795 }
796
797 if ($self->is_scored) {
798 $ga[7] = "\nResult: " . $self->score_string;
799 }
800
801 $text = "\n<infoblock><header>Game Update</header>";
802 for (0..7) {
803 if ($self->{gatext}[$_] ne $ga[$_]) {
804 $text .= $ga[$_];
805 }
806 }
807 $text .= "</infoblock>";
808
809 $self->{gatext} = \@ga;
810 532 }
811 $self->{text}->append_text ($text); 533 $text .= "\nType: " . util::toxml $gametype{$self->type};
812}
813
814sub event_update_rules {
815 my ($self, $rules) = @_;
816
817 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
818 for BLACK, WHITE;
819
820 sound::play 3, "gamestart";
821
822 my $text = "\n<header>Game Rules</header>";
823 534
824 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 535 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
825 536
826 $text .= "\nTime: "; 537 $text .= "\nTime: ";
827 538
829 $text .= "UNLIMITED"; 540 $text .= "UNLIMITED";
830 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 541 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
831 $text .= util::format_time $rules->{time}; 542 $text .= util::format_time $rules->{time};
832 $text .= " ABS"; 543 $text .= " ABS";
833 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 544 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
834 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 545 $text .= util::format_time $rules->{time};
835 $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};
836 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 547 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
837 $text .= util::format_time $rules->{time}; 548 $text .= util::format_time $rules->{time};
838 $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};
839 } 550 }
840 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
841 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 569 $inlay->append_text ("<infoblock>$text</infoblock>");
842}
843 570
844sub inject_resign_game { 571}
572
573sub event_update_rules {
845 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) = @_;
846 590
847 sound::play 3, "resign"; 591 sound::play 3, "resign";
848
849 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 592 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
850 . "\n<user>" 593 . "\n<user>"
851 . (util::toxml $self->{user}[$msg->{player}]->as_string) 594 . (util::toxml $self->{user}[$msg->{player}]->as_string)
852 . "</user> resigned.</infoblock>"); 595 . "</user> resigned.</infoblock>");
853} 596}
854 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
855sub inject_final_result { 608sub inject_final_result {
856 my ($self, $msg) = @_; 609 my ($self, $msg) = @_;
857 610
858 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 611 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
859 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 612 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
860 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 613 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
861 . "</infoblock>" 614 . "</infoblock>"
862 ); 615 );
863} 616}
864 617
865sub destroy { 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 {
866 my ($self) = @_; 647 my ($self, $id) = @_;
867 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 648
868 for BLACK, WHITE; 649 my $info = $self->{challenge}{$id};
869 $self->SUPER::destroy; 650 my $inlay = $info->{inlay};
870 delete $appwin::gamelist->{game}{$self->{channel}}; 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
815sub event_challenge {
816 my ($self, $info) = @_;
817
818 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
819 my $opponent = $as_black ? $info->{white} : $info->{black};
820
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 );
871} 836}
872 837
8731; 8381;
874 839

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines