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

Diff Legend

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