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.36 by pcg, Tue Jun 3 07:35:08 2003 UTC vs.
Revision 1.78 by pcg, Mon Aug 4 02:14:44 2003 UTC

1use utf8; 1use utf8;
2 2
3package game::goclock; 3package game::goclock;
4
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked.
4 7
5use Time::HiRes (); 8use Time::HiRes ();
6 9
7use KGS::Constants; 10use KGS::Constants;
8 11
… …
18 $self->{format} = sub { "ERROR" }; 21 $self->{format} = sub { "ERROR" };
19 22
20 $self; 23 $self;
21} 24}
22 25
23sub format_time($) { 26sub configure {
24 my ($time) = @_;
25
26 $time > 60*60
27 ? sprintf "%d:%02d:%02d", $time / (60 * 60), $time / 60 % 60, $time % 60
28 : sprintf "%d:%02d", $time / 60 % 60, $time % 60;
29}
30
31sub set_rules {
32 my ($self, $timesys, $main, $interval, $count) = @_; 27 my ($self, $timesys, $main, $interval, $count) = @_;
33 28
34 if ($timesys == TIMESYS_ABSOLUTE) { 29 if ($timesys == TIMESYS_ABSOLUTE) {
35 $self->{set} = sub { $self->{time} = $_[0] }; 30 $self->{set} = sub { $self->{time} = $_[0] };
36 $self->{format} = sub { format_time $_[0] }; 31 $self->{format} = sub { util::format_time $_[0] };
37 32
38 } elsif ($timesys == TIMESYS_BYO_YOMI) { 33 } elsif ($timesys == TIMESYS_BYO_YOMI) {
39 my $low = $interval * $count; 34 my $low = $interval * $count;
40 35
41 $self->{set} = sub { $self->{time} = $_[0] }; 36 $self->{set} = sub { $self->{time} = $_[0] };
42 37
43 $self->{format} = sub { 38 $self->{format} = sub {
44 if ($_[0] > $low) { 39 if ($_[0] > $low) {
45 format_time $_[0] - $low; 40 util::format_time $_[0] - $low;
46 } else { 41 } else {
47 sprintf "%s (%d)", 42 sprintf "%s (%d)",
48 format_time int ($_[0] % $interval) || $interval, 43 util::format_time int (($_[0] - 1) % $interval + 1),
49 $_[0] / $interval; 44 ($_[0] - 1) / $interval;
50 } 45 }
51 }; 46 };
52 47
53 } elsif ($timesys == TIMESYS_CANADIAN) { 48 } elsif ($timesys == TIMESYS_CANADIAN) {
54 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] }; 49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
55 50
56 $self->{format} = sub { 51 $self->{format} = sub {
57 if (!$self->{moves}) { 52 if (!$self->{moves}) {
58 format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
59 } else { 54 } else {
60 my $time = int($_[0] % $interval) || $interval; 55 my $time = int (($_[0] - 1) % $interval + 1);
56
61 sprintf "%s/%d {%d}", 57 sprintf "%s/%d =%d",
62 format_time $time, 58 util::format_time $time,
63 $self->{moves}, 59 $self->{moves},
60 $self->{moves} > 1
64 int ($time / ($self->{moves} || 1)); 61 ? $time / $self->{moves}
65 62 : $interval;
66 } 63 }
67 }; 64 };
68 65
69 } else { 66 } else {
70 # none, or unknown 67 # none, or unknown
… …
73 } 70 }
74} 71}
75 72
76sub refresh { 73sub refresh {
77 my ($self, $timestamp) = @_; 74 my ($self, $timestamp) = @_;
78 my $timer = $self->{time} + $self->{start} - $timestamp + 0.5; 75 my $timer = $self->{time} + $self->{start} - $timestamp;
79 76
80 # 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,
81 # and this gives smoother timers ;) 78 # and this gives smoother timers ;)
79 my @format = $self->{format}->(int ($timer + 0.4));
82 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); 80 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4)));
83 81
84 $timer - int $timer; 82 $timer - int $timer;
85} 83}
86 84
… …
147 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 145 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
148 146
149 $self; 147 $self;
150} 148}
151 149
152sub set_rules { 150sub configure {
153 my ($self, $rules) = @_; 151 my ($self, $app, $user, $rules) = @_;
154 152
155 if ($self->{name}->get_text ne $rules->{player}[$self->{colour}]) { 153 if ($self->{name}->get_text ne $user->as_string) {
156 $self->{name}->set_text ($rules->{player}[$self->{colour}]); 154 $self->{name}->set_text ($user->as_string);
157 155
158 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 156 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
159 $self->{imagebox}->add (gtk::image_from_data undef); 157 $self->{imagebox}->add (gtk::image_from_data undef);
160 $self->{imagebox}->show_all; 158 $self->{imagebox}->show_all;
161 159
160 if ($user->has_pic) {
162 # the big picture... 161 # the big picture...
163 appwin::userpic ($rules->{player}[$self->{colour}], sub { 162 $app->userpic ($user->{name}, sub {
164 return unless $self->{imagebox}; 163 return unless $self->{imagebox};
164
165 if ($_[0]) { 165 if ($_[0]) {
166 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 166 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
167 $self->{imagebox}->add (gtk::image_from_data $_[0]); 167 $self->{imagebox}->add (gtk::image_from_data $_[0]);
168 $self->{imagebox}->show_all; 168 $self->{imagebox}->show_all;
169 }
169 } 170 });
170 }); 171 }
171 }
172 172 }
173
173 $self->{clock}->set_rules (@{$rules->{rules}}{qw(timesys time interval count)}); 174 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
174} 175}
175 176
176sub set_state { 177sub set_state {
177 my ($self, $captures, $timer, $when) = @_; 178 my ($self, $captures, $timer, $when) = @_;
178 179
… …
186package game; 187package game;
187 188
188use KGS::Constants; 189use KGS::Constants;
189use KGS::Game::Board; 190use KGS::Game::Board;
190 191
192use Gtk2::GoBoard;
193
191use base KGS::Listener::Game; 194use base KGS::Listener::Game;
192use base KGS::Game; 195use base KGS::Game;
193 196
194use base gtk::widget; 197use base gtk::widget;
195 198
… …
200 $self = $self->SUPER::new(@_); 203 $self = $self->SUPER::new(@_);
201 204
202 $self->listen($self->{conn}); 205 $self->listen($self->{conn});
203 206
204 $self->{window} = new Gtk2::Window 'toplevel'; 207 $self->{window} = new Gtk2::Window 'toplevel';
205 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
206 $self->{window}->set_title("KGS Game $title");
207 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 208 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
208 209
209 $self->{window}->signal_connect(delete_event => sub { 210 $self->{window}->signal_connect(delete_event => sub {
210 $self->part; 211 $self->part;
211 $self->destroy; 212 $self->destroy;
… …
230 # board box (aspect/canvas) 231 # board box (aspect/canvas)
231 232
232 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 233 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
233 234
234 { 235 {
235 $frame->add(my $vbox = new Gtk2::VBox); 236 $frame->add (my $vbox = new Gtk2::VBox);
236 $vbox->add($self->{title} = new Gtk2::Label $title); 237 $vbox->add ($self->{title} = new Gtk2::Label $title);
237 238
239 $vbox->add (my $hbox = new Gtk2::HBox);
240
241 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
242
238 $self->{moveadj} = new Gtk2::Adjustment 0, 0, 0, 1, 1, 0; 243 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
239 244
240 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 245 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
241 $scale->set_draw_value (0); 246 $scale->set_draw_value (0);
242 $scale->set_digits (0); 247 $scale->set_digits (0);
243 248
244 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 249 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
245 } 250 }
246 251
247 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0); 252 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
248 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
249 $self->{board_label} = $aspect_frame->get_label_widget;
250
251 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
252 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
253
254 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
255 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
256 253
257 # RIGHT PANE 254 # RIGHT PANE
258 255
259 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); 256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
260 $self->{hpane}->set(position_set => 1); 257 $self->{hpane}->set(position_set => 1);
… …
266 $sw->add(($self->{userlist} = new userlist)->widget); 263 $sw->add(($self->{userlist} = new userlist)->widget);
267 264
268 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
269 266
270 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
271 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 268 $hbox->add (($self->{userpanel}[COLOUR_WHITE] = new game::userpanel colour => COLOUR_WHITE)->widget);
272 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 269 $hbox->add (($self->{userpanel}[COLOUR_BLACK] = new game::userpanel colour => COLOUR_BLACK)->widget);
273 270
274 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 271 $vbox->pack_start(($self->{chat} = new chat), 1, 1, 0);
275 272
276 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
277 $self->{entry}->signal_connect(activate => sub { 273 $self->{chat}->signal_connect(command => sub {
278 my $text = $self->{entry}->get_text; 274 my ($chat, $cmd, $arg) = @_;
279 $self->say($text) if $text =~ /\S/; 275 if ($cmd eq "rsave") {
280 $self->{entry}->set_text(""); 276 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
277 } else {
278 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
279 }
281 }); 280 });
282 281
283 $self->event_update_game; 282 $self->event_update_game;
284 $self; 283 $self;
285} 284}
286 285
287sub event_update_users { 286sub event_update_users {
288 my ($self, $add, $update, $remove) = @_; 287 my ($self, $add, $update, $remove) = @_;
289 288
289 return unless $self->{userlist};
290
290 $self->{userlist}->update ($add, $update, $remove); 291 $self->{userlist}->update ($add, $update, $remove);
292
293 my %important;
294 $important{$self->{user1}{name}}++;
295 $important{$self->{user2}{name}}++;
296 $important{$self->{user3}{name}}++;
297
298 if (my @users = grep $important{$_->{name}}, @$add) {
299 $self->{chat}->append_text ("\n<header>Joins:</header>");
300 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
301 }
302 if (my @users = grep $important{$_->{name}}, @$remove) {
303 $self->{chat}->append_text ("\n<header>Parts:</header>");
304 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
305 }
306
291} 307}
292 308
293sub join { 309sub join {
294 my ($self) = @_; 310 my ($self) = @_;
295 return if $self->{joined}; 311 return if $self->{joined};
… …
304 320
305 $self->SUPER::part; 321 $self->SUPER::part;
306 $self->destroy; 322 $self->destroy;
307} 323}
308 324
309sub configure_event {
310 my ($widget, $event, $self) = @_;
311 delete $self->{stack};
312 delete $self->{pixbuf};
313 delete $self->{board_shown};
314 delete $self->{background};
315 $self->repaint_board;
316 0;
317}
318
319sub expose_event {
320 my ($widget, $event, $self) = @_;
321
322 $self->{pixbuf} or return;
323
324 my $area = $event->area;
325
326 $self->redraw ($area);
327
328 0;
329}
330
331# something Gtk2 fixed
332sub INTERP_NEAREST (){ 'nearest' }
333sub INTERP_TILES (){ 'tiles' }
334sub INTERP_BILINEAR (){ 'bilinear' }
335sub INTERP_HYPER (){ 'hyper' }
336
337sub new_pixbuf {
338 my ($w, $h, $alpha, $fill) = @_;
339
340 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
341 $pixbuf->fill ($fill) if defined $fill;
342
343 $pixbuf;
344}
345
346sub scale_pixbuf {
347 my ($src, $w, $h, $mode) = @_;
348
349 my $dst = new_pixbuf $w, $h, 1;
350
351 $src->scale(
352 $dst, 0, 0, $w, $h, 0, 0,
353 $w / $src->get_width, $h / $src->get_height,
354 $mode,
355 );
356
357 $dst;
358}
359
360# create a stack of stones
361sub create_stack {
362 my ($self, $mark, $size, $rand) = @_;
363
364 my $shadow = $size * 0.05;
365
366 my $c = \$self->{stack}{$mark};
367 unless ($$c) {
368 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
369 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
370
371 # zeroeth the shadow
372 if ($mark & (MARK_B | MARK_W)) {
373 # the -0.5's are a mystery to me
374 $::shadow_img->composite (
375 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
376 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
377 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
378 );
379 }
380
381 # first the big stones (handicap stones different for effect)
382 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
383 [MARK_W, $mark & MARK_MOVE ? 255 : 192],
384 [MARK_GRAY_B, 128],
385 [MARK_GRAY_W, 128]) {
386 my ($mask, $alpha) = @$_;
387 if ($mark & $mask) {
388 $stone->composite (
389 $base, 0, 0, $size, $size, 0, 0,
390 $size / $stone->get_width, $size / $stone->get_height,
391 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
392 );
393 }
394 }
395
396 # then the small stones
397 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
398 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
399 my ($mask, $img) = @$_;
400 if ($mark & $mask) {
401 $img->composite (
402 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
403 $size / $img->get_width / 2, $size / $img->get_height / 2,
404 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
405 );
406 }
407 }
408
409 # and lastly any markers
410 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
411
412 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
413 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
414 [MARK_SQUARE, $::square_img[$dark_bg]]) {
415 my ($mask, $img) = @$_;
416 if ($mark & $mask) {
417 $img->composite (
418 $base, 0, 0, $size, $size, 0, 0,
419 $size / $img->get_width, $size / $img->get_height,
420 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
421 );
422 }
423 }
424
425 push @$$c, $base;
426 }
427 }
428
429 $$c->[$rand % @$$c];
430}
431
432sub pixbuf_text {
433 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
434
435 my @c = grep $_,
436 map $::font[$colour][$::fontmap{$_}],
437 split //, $text;
438
439 if (@c) {
440 my $spacing = $height * 0.1;
441 my $s = $height / List::Util::max map $_->get_height, @c;
442 my $W = List::Util::sum map $_->get_width, @c;
443
444 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
445 $y -= $height * 0.5;
446
447 for (@c) {
448 my $w = $_->get_width * $s;
449 # +2 == don't fight the rounding
450 $_->composite ($pixbuf,
451 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
452 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
453
454 $x += $w + $spacing;
455 }
456 }
457}
458
459sub pixbuf_rect {
460 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
461 # we fake lines by... a horrible method :/
462 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
463 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
464 INTERP_NEAREST, $alpha);
465}
466
467sub repaint_board {
468 my ($self) = @_;
469 my $canvas = $self->{canvas};
470 my $expose_area = undef;
471
472 return $expose_area unless $self->{board};
473
474 my ($w, $h) = ($canvas->allocation->values)[2,3];
475
476 die "FATAL: board aspect ratio != 1" unless $w == $h;
477
478 my $s = $w;
479
480 return unless $s >= 200;
481
482 my $size = $self->{size};
483
484 # we leave enough space for the shadows.. I like smaller stones, and we
485 # do no need to do the nifty recursive screen updates that goban2 does
486 my $border = int ($s / ($size + 3) * 0.5);
487 my $s2 = $s - $border * 2;
488 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
489 my $ofs = int ($edge / 2);
490
491 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
492
493 my $pixbuf;
494
495 my $oldboard;
496
497 if ($self->{background}) {
498 if ($oldboard = $self->{board_shown}) {
499 $pixbuf = $self->{pixbuf};
500 } else {
501 $pixbuf = $self->{background}->copy;
502 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
503 }
504 } else {
505 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
506
507 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
508
509 if ($s < $bw && $s < $bh) {
510 $pixbuf = new_pixbuf $s, $s, 0;
511 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
512 } else {
513 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
514 }
515
516 my $linew = int ($s / 40 / $size);
517
518 # ornamental border... we have time to waste :/
519 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
520 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
521 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
522 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
523
524 for my $i (1 .. $size) {
525 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
526 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
527
528 # 38 max, but we allow a bit more
529 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
530 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];
531
532 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
533 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
534 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
535 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
536
537 $a++;
538 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
539 }
540
541 # hoshi points
542 my $hoshi = sub {
543 my ($x, $y) = @_;
544 my $hs = int ($edge / 4) | 1;
545 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
546
547 # we use the shadow mask... not perfect, but I want to finish this
548 $::shadow_img->composite ($pixbuf,
549 $x, $y, $hs + 1, $hs + 1, $x, $y,
550 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
551 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
552 };
553
554 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
555 $hoshi->($h1, $h1);
556 $hoshi->($size - $h1 + 1, $h1);
557 $hoshi->($h1, $size - $h1 + 1);
558 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
559
560 if ($size % 2) { # on odd boards, also the remaining 5
561 my $h2 = ($size + 1) / 2;
562 if ($size > 10) {
563 $hoshi->($h1, $h2);
564 $hoshi->($size - $h1 + 1, $h2);
565 $hoshi->($h2, $size - $h1 + 1);
566 $hoshi->($h2, $h1);
567 }
568 # the tengen
569 $hoshi->($h2, $h2);
570 }
571
572 unless ($::config->{conserve_memory} > 1) {
573 $self->{background} = $pixbuf;
574 $pixbuf = $pixbuf->copy;
575 }
576 }
577
578 $self->{pixbuf} = $pixbuf;
579
580 # hoshi-points(!)#d#
581 # caching of empty board gfx(!)#d#
582
583 for my $x (1 .. $size) {
584 for my $y (1 .. $size) {
585 my $rand = ($x ^ $y ^ 0x5555);
586
587 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
588
589 if ($::config->{randomize}) {
590 $dx += ($rand % 7) - 3;
591 $dy += ($rand / 3 % 7) - 3;
592 }
593
594 my $shadow = $edge * 0.05;
595 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
596
597 my $mark = $self->{board}{board}[$x-1][$y-1];
598 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
599
600 if ($oldboard) {
601 next if $old == $mark; # no change
602
603 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
604 $expose_area = $expose_area
605 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
606 : new Gtk2::Gdk::Rectangle @$area;
607 }
608
609 if ($mark) {
610 my $pb = $self->create_stack($mark, $edge, $rand);
611
612 $pb->composite ($pixbuf, @$area,
613 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
614
615 # labels are handled here because they are quite rare
616 if ($mark & MARK_LABEL) {
617 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
618
619 if ($white) {
620 pixbuf_text $pixbuf, 0,
621 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
622 $self->{board}{label}[$x-1][$y-1];
623 }
624 pixbuf_text $pixbuf, $white,
625 $k[$x], $k[$y], $ofs * 0.7,
626 $self->{board}{label}[$x-1][$y-1];
627 }
628 }
629 }
630 }
631
632 $self->{board_shown} = Storable::dclone $self->{board};
633 #d# save
634 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
635
636 $expose_area;
637}
638
639sub redraw {
640 my ($self, $area) = @_;
641
642 if ($area && $self->{pixbuf}) {
643 my ($x, $y, $w, $h) = $area->values;
644
645 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
646 $x, $y, $x, $y, $w, $h,
647 "normal", 0, 0);
648 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
649 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
650 }
651}
652
653sub update_board { 325sub update_board {
654 my ($self) = @_; 326 my ($self) = @_;
655 return unless $self->{path}; 327 return unless $self->{path};
656 328
657 my $move = int $self->{moveadj}->get_value; 329 my $move = int $self->{moveadj}->get_value;
658 330
659 my $running = $move == @{$self->{path}}; 331 my $running = $move == @{$self->{path}};
660 332
661 $self->{board_label}->set_text ("Move $move"); 333 $self->{board_label}->set_text ("Move " . ($move - 1));
662 334
663 $self->{board} = new KGS::Game::Board $self->{size}; 335 $self->{cur_board} = new KGS::Game::Board $self->{size};
664 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 336 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
665 337
666 for my $colour (WHITE, BLACK) { 338 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
667 $self->{userpanel}[$colour]->set_state ( 339 $self->{userpanel}[$colour]->set_state (
668 $self->{board}{captures}[$colour], 340 $self->{cur_board}{captures}[$colour],
669 $self->{board}{timer}[$colour], 341 $self->{cur_board}{timer}[$colour],
670 ($running && $self->{lastmove_colour} == !$colour) 342 ($running && $self->{lastmove_colour} == !$colour)
671 ? $self->{lastmove_time} : 0 343 ? $self->{lastmove_time} : 0
672 ); 344 );
673 } 345 }
674 346
675 $self->redraw ($self->repaint_board); 347 $self->{board}->set_board ($self->{cur_board});
676} 348}
677 349
678sub event_update_tree { 350sub event_update_tree {
679 my ($self) = @_; 351 my ($self) = @_;
680 352
681 $self->{path} = $self->get_path; 353 $self->{path} = $self->get_path;
682
683 $self->{userpanel}[WHITE]->set_rules ($self->{path}[0]); # should be onload only
684 $self->{userpanel}[BLACK]->set_rules ($self->{path}[0]); # should be onload only
685 354
686 if ($self->{moveadj}) { 355 if ($self->{moveadj}) {
687 my $upper = $self->{moveadj}->upper; 356 my $upper = $self->{moveadj}->upper;
688 my $pos = $self->{moveadj}->get_value; 357 my $pos = $self->{moveadj}->get_value;
358 my $move = scalar @{$self->{path}};
689 359
690 $self->{moveadj}->upper (scalar @{$self->{path}}); 360 $self->{moveadj}->upper ($move);
691 361
692 $self->{moveadj}->changed; 362 $self->{moveadj}->changed;
693 if ($pos == $upper) { 363 if ($pos == $upper) {
694 $self->{moveadj}->set_value (scalar @{$self->{path}}); 364 $self->{moveadj}->value ($move);
695 } else {
696 $self->{moveadj}->value_changed; 365 $self->{moveadj}->value_changed;
697 } 366 }
698 } 367 }
699} 368}
700 369
… …
707 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>" 376 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
708 if $newnode; 377 if $newnode;
709 378
710 for (split /\n/, $comment) { 379 for (split /\n/, $comment) {
711 $text .= "\n"; 380 $text .= "\n";
712 if ($_ =~ s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) { 381 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
713 $text .= "<user>" . (util::toxml $1) . "</user>:"; 382 $text .= "<user>" . (util::toxml $1) . "</user>:";
714 } 383 }
384
385 # coords only for 19x19 so far
386 $_ = util::toxml $_;
387 s{
388 (
389 \b
390 (?:[bw])?
391 [, ]{0,2}
392 [a-hj-t] # valid for upto 19x19
393 \s?
394 [1-9]?[0-9]
395 \b
396 )
397 }{
398 "<coord>$1</coord>";
399 }sgexi;
400
715 $text .= $_; 401 $text .= $_;
716 } 402 }
717 403
718 $self->{text}->append_text ($text); 404 $self->{chat}->append_text ($text);
719} 405}
720 406
721sub event_join { 407sub event_join {
722 my ($self) = @_; 408 my ($self) = @_;
723 $self->SUPER::event_join; 409 $self->SUPER::event_join;
724} 410}
725 411
726sub event_part { 412sub event_part {
727 my ($self) = @_; 413 my ($self) = @_;
728 $self->SUPER::event_part; 414 $self->SUPER::event_part;
415 $self->destroy;
729} 416}
730 417
731sub event_move { 418sub event_move {
732 my ($self, $pass) = @_; 419 my ($self, $pass) = @_;
733 sound::play 1, $pass ? "pass" : "move"; 420 sound::play 1, $pass ? "pass" : "move";
… …
735 422
736sub event_update_game { 423sub event_update_game {
737 my ($self) = @_; 424 my ($self) = @_;
738 $self->SUPER::event_update_game; 425 $self->SUPER::event_update_game;
739 426
740 $text = "\n<header>Game Update</header>"; 427 return unless $self->{window};
741
742 $text .= "\nType: " . (util::toxml $gametype{$self->type})
743 . " (" . (util::toxml $gameopt{$self->option}) . ")";
744 $text .= "\nFlags:";
745 $text .= " valid" if $self->is_valid;
746 $text .= " adjourned" if $self->is_adjourned;
747 $text .= " scored" if $self->is_scored;
748 $text .= " saved" if $self->is_saved;
749 428
750 $text .= "\nWhite: <user>" . (util::toxml $self->{user1}->as_string) . "</user>"; 429 my $title = defined $self->{channel}
751 $text .= "\nBlack: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"; 430 ? $self->owner->as_string . " " . $self->opponent_string
752 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 431 : "Game Window";
432 $self->{window}->set_title("KGS Game $title");
433 $self->{title}->set_text ($title);
753 434
435 $self->{user}[COLOUR_BLACK] = $self->{user1};
436 $self->{user}[COLOUR_WHITE] = $self->{user2};
437
438 # show board
439
754 if ($self->is_valid) { 440 if ($self->is_valid) {
755 $text .= "\nHandicap: " . $self->{handicap}; 441 #D# TODO: check wether already inside, or already removed!!!
756 $text .= "\nKomi: " . $self->{komi}; 442 $self->{left}->add ($self->{boardbox});
757 $text .= "\nSize: " . $self->size_string; 443 $self->{left}->remove ($self->{challenge}->widget) if $self->{challenge};
444 } else {
445 #D# TODO: check wether already inside, or already removed!!!
446 $self->{left}->add ($self->{challenge}->widget);
447 $self->{left}->remove ($self->{boardbox});
448 }
449 $self->{left}->show_all;
450
451 # view text
758 } 452
453 eval { #d#
454 my @ga;
455 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
456 . " (" . (util::toxml $gameopt{$self->option}) . ")";
457 $ga[1] = "\nFlags:";
458 $ga[1] .= " valid" if $self->is_valid;
459 $ga[1] .= " adjourned" if $self->is_adjourned;
460 $ga[1] .= " scored" if $self->is_scored;
461 $ga[1] .= " saved" if $self->is_saved;
759 462
760 $self->{text}->append_text ($text); 463 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
761 464
762 $self->{left}->remove ($_) for $self->{left}->get_children; 465 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
466 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
467 if $self->is_valid;
468
763 if ($self->is_valid) { 469 if ($self->is_valid) {
764 $self->{left}->add ($self->{boardbox}); 470 $ga[4] = "\nHandicap: " . $self->{handicap};
765 (delete $self->{challenge})->destroy if $self->{challenge}; 471 $ga[5] = "\nKomi: " . $self->{komi};
766 } else { 472 $ga[6] = "\nSize: " . $self->size_string;
767 $self->{left}->add ($self->{challenge}->widget); 473 }
474
475 if ($self->is_scored) {
476 $ga[7] = "\nResult: " . $self->score_string;
477 }
478
479 $text = "\n<infoblock><header>Game Update</header>";
480 for (0..7) {
481 if ($self->{gatext}[$_] ne $ga[$_]) {
482 $text .= $ga[$_];
483 }
484 }
485 $text .= "</infoblock>";
486
487 $self->{gatext} = \@ga;
768 } 488 };
769 $self->{left}->show_all; 489
490 $self->{chat}->append_text ($text);
491}
492
493sub event_update_rules {
494 my ($self, $rules) = @_;
495
496 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
497 for COLOUR_BLACK, COLOUR_WHITE;
498
499 sound::play 3, "gamestart";
500
501 my $text = "\n<header>Game Rules</header>";
502
503 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
504
505 $text .= "\nTime: ";
506
507 if ($rules->{timesys} == TIMESYS_NONE) {
508 $text .= "UNLIMITED";
509 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
510 $text .= util::format_time $rules->{time};
511 $text .= " ABS";
512 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
513 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
514 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
515 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
516 $text .= util::format_time $rules->{time};
517 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
518 }
519
520 $self->{chat}->append_text ("<infoblock>$text</infoblock>");
521}
522
523sub inject_resign_game {
524 my ($self, $msg) = @_;
525
526 sound::play 3, "resign";
527
528 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
529 . "\n<user>"
530 . (util::toxml $self->{user}[$msg->{player}]->as_string)
531 . "</user> resigned.</infoblock>");
532}
533
534sub inject_final_result {
535 my ($self, $msg) = @_;
536
537 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
538 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
539 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
540 . "</infoblock>"
541 );
542}
543
544sub event_challenge {
545 my ($self, $challenge) = @_;
546
547 use KGS::Listener::Debug;
548 $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
770} 549}
771 550
772sub destroy { 551sub destroy {
773 my ($self) = @_; 552 my ($self) = @_;
774 (delete $self->{userpanel}[WHITE])->destroy if $self->{userpanel}[WHITE]; 553
775 (delete $self->{userpanel}[BLACK])->destroy if $self->{userpanel}[BLACK]; 554 delete $self->{app}{gamelist}{game}{$self->{channel}};
555 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
556 for COLOUR_BLACK, COLOUR_WHITE;
776 $self->SUPER::destroy; 557 $self->SUPER::destroy;
777 delete $appwin::gamelist->{game}{$self->{channel}};
778} 558}
779 559
7801; 5601;
781 561

Diff Legend

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