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.37 by pcg, Tue Jun 3 13:47:46 2003 UTC vs.
Revision 1.81 by pcg, Fri Apr 2 23:22:30 2004 UTC

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

Diff Legend

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