ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/kgsueme/bin/kgsueme
(Generate patch)

Comparing kgsueme/bin/kgsueme (file contents):
Revision 1.24 by pcg, Fri May 30 11:59:28 2003 UTC vs.
Revision 1.30 by pcg, Sat May 31 05:35:48 2003 UTC

1#!/usr/bin/perl -I../lib/ 1#!/usr/bin/perl
2 2
3use Gtk; 3use Gtk;
4use Gtk::Gdk; 4use Gtk::Gdk;
5use Gtk::Gdk::Pixbuf; 5use Gtk::Gdk::Pixbuf;
6#use Gtk::Gdk::ImlibImage; 6#use Gtk::Gdk::ImlibImage;
… …
10 10
11use Audio::Data; 11use Audio::Data;
12use Audio::Play; 12use Audio::Play;
13 13
14use IO::Socket::INET; 14use IO::Socket::INET;
15 15use List::Util;
16use Errno; 16use Errno;
17 17
18init Gtk; 18init Gtk;
19 19
20$HACK = 1; # do NEVER enable. ;) 20our $HACK = 1; # do NEVER enable. ;)
21our $DEBUG_EXPOSE = 0;
22
23if ($HACK) {
24 $KGS::debug = 1;
25}
26
27our $VERSION = "0.1";
21 28
22our $config; 29our $config;
23our $LIBDIR = "."; 30our $LIBDIR = ".";
24our $IMGDIR = "$LIBDIR/images"; 31our $IMGDIR = "$LIBDIR/images";
25our $SNDDIR = "$LIBDIR/sounds"; 32our $SNDDIR = "$LIBDIR/sounds";
… …
50{ 57{
51 #my $audioserver = new Audio::Play(0); 58 #my $audioserver = new Audio::Play(0);
52 my %sound; 59 my %sound;
53 $SIG{CHLD} = 'IGNORE'; 60 $SIG{CHLD} = 'IGNORE';
54 61
55 for (qw(alarm warning move)) { 62 for (qw(alarm warning move pass ring connect user_unknown)) {
56 local $/; 63 local $/;
57 open my $snd, "<", "$SNDDIR/$_" 64 open my $snd, "<", "$SNDDIR/$_"
58 or die "$SNDDIR: $!"; 65 or die "$SNDDIR/$_: $!";
59 binmode $snd; 66 binmode $snd;
60 67
61 $sound{$_} = new Audio::Data; 68 $sound{$_} = new Audio::Data;
62 $sound{$_}->Load($snd); 69 $sound{$_}->Load($snd);
63 } 70 }
64 71
65 sub play_sound { 72 sub play_sound {
73 my ($annoyancy, $sound) = @_;
74 # annoyany 1 => important, annoyance 2 => useful, annoyancy 3 => not useful
66 if (fork == 0) { 75 if (fork == 0) {
67 if (my $audioserver = new Audio::Play(1)) { 76 if (my $audioserver = new Audio::Play(1)) {
68 $audioserver->play ($sound{$_[0]}); 77 $audioserver->play ($sound{$sound});
69 } 78 }
70 Gtk->_exit(0); 79 Gtk->_exit(0);
71 } 80 }
72 } 81 }
73} 82}
… …
81 my $state = -r $staterc ? Storable::retrieve($staterc) : {}; 90 my $state = -r $staterc ? Storable::retrieve($staterc) : {};
82 my @widgets; 91 my @widgets;
83 92
84 $config = $state->{config} ||= {}; 93 $config = $state->{config} ||= {};
85 94
86 $config{speed} = 1;#d# optimize for speed or memory? 95 $config->{speed} = 1;#d# optimize for speed or memory?
87 $config{conserve_memory} = 0; 96 $config->{conserve_memory} = 0; # try to conserve memory at the expense of speed
97 $config->{randomize} = 0; # randomize placement of stones
88 98
89 # grr... more gtk+ brokenness 99 # grr... more gtk+ brokenness
90 my %get = ( 100 my %get = (
91 hpane_position => sub { ($_[0]->children)[0]->allocation->[2] }, 101 hpane_position => sub { ($_[0]->children)[0]->allocation->[2] },
92 vpane_position => sub { ($_[0]->children)[0]->allocation->[3] }, 102 vpane_position => sub { ($_[0]->children)[0]->allocation->[3] },
… …
182} 192}
183 193
184if (0) { 194if (0) {
185 use KGS::Constants; 195 use KGS::Constants;
186 196
187 my $board = new game size => 5; 197 for (19) {
198 my $board = new game %{Storable::retrieve "testboard.storable"};
199
200 if (0) {
188 $board->{board} = new KGS::Game::Board; 201 $board->{board} = new KGS::Game::Board;
189 $board->{board}{board}[0][0] = MARK_B; 202 $board->{board}{board}[0][0] = MARK_B;
190 $board->{board}{board}[1][1] = MARK_GRAY_B | MARK_SMALL_W; 203 $board->{board}{board}[1][1] = MARK_GRAY_B | MARK_SMALL_W;
191 $board->{board}{board}[2][2] = MARK_W | MARK_TRIANGLE; 204 $board->{board}{board}[2][2] = MARK_W | MARK_TRIANGLE;
205 $board->{board}{board}[1][2] = MARK_B | MARK_LABEL;
206 $board->{board}{label}[1][2] = "198";
207 $board->{board}{board}[0][2] = MARK_W | MARK_LABEL;
208 $board->{board}{label}[0][2] = "AWA";
209 }
192 $board->{window}->show_all; 210 $board->{window}->show_all;
211 }
193} 212}
194 213
195main Gtk; 214main Gtk;
196 215
197############################################################################# 216#############################################################################
… …
204 my $self = shift; 223 my $self = shift;
205 $self = $self->SUPER::new(@_); 224 $self = $self->SUPER::new(@_);
206 225
207 $self->{conn} = new KGS::Protocol; 226 $self->{conn} = new KGS::Protocol;
208 227
209 KGS::Listener::Debug->new->listen($self->{conn}); #d# debug only :) 228 KGS::Listener::Debug->new->listen($self->{conn}, "any"); #d# debug only :)
210 229
211 $self->listen($self->{conn}); 230 $self->listen($self->{conn}, "login");
212 231
213 $self->{roomlist} = new roomlist conn => $self->{conn}; 232 $self->{roomlist} = new roomlist conn => $self->{conn};
214 233
215 $self->{window} = new Gtk::Window 'toplevel'; 234 $self->{window} = new Gtk::Window 'toplevel';
216 $self->{window}->set_title('kgsueme'); 235 $self->{window}->set_title('kgsueme');
… …
279 } 298 }
280 $self->{conn}->feed_data($buf); 299 $self->{conn}->feed_data($buf);
281 }; 300 };
282 301
283 # now login 302 # now login
284 $self->{conn}->login($self->{login}->get_text, $self->{password}->get_text); 303 $self->{conn}->login("kgsueme $VERSION $^O", $self->{login}->get_text, $self->{password}->get_text);
285} 304}
286 305
287sub inject_login { 306sub inject_login {
288 my ($self, $msg) = @_; 307 my ($self, $msg) = @_;
289 308
… …
292 311
293 if ($msg->{success}) { 312 if ($msg->{success}) {
294 for (keys %{$::config->{rooms}}) { 313 for (keys %{$::config->{rooms}}) {
295 $self->{roomlist}->join_room($_); 314 $self->{roomlist}->join_room($_);
296 } 315 }
316 ::play_sound 3, "connect";
317 } elsif ($msg->{result} eq "user unknown") {
318 ::play_sound 2, "user_unknown";
319 } else {
320 ::play_sound 2, "warning";
297 } 321 }
298} 322}
299 323
300sub event_disconnect { } 324sub event_disconnect { }
301 325
… …
383 407
384sub new { 408sub new {
385 my $self = shift; 409 my $self = shift;
386 $self = $self->SUPER::new(@_); 410 $self = $self->SUPER::new(@_);
387 411
388 $self->listen($self->{conn}); 412 $self->listen($self->{conn}, qw(msg_room:));
389 413
390 $self->{window} = new Gtk::Window 'toplevel'; 414 $self->{window} = new Gtk::Window 'toplevel';
391 $self->{window}->set_title("KGS Room $self->{name}"); 415 $self->{window}->set_title("KGS Room $self->{name}");
392 ::state $self->{window}, "room::window", $self->{name}, window_size => [600, 400]; 416 ::state $self->{window}, "room::window", $self->{name}, window_size => [600, 400];
393 417
… …
407 ::state $self->{gamelist}, "room::gamelist", $self->{name}, clist_column_widths => [20, 120, 120, 120]; 431 ::state $self->{gamelist}, "room::gamelist", $self->{name}, clist_column_widths => [20, 120, 120, 120];
408 432
409 $self->{gamelist}->signal_connect(select_row => sub { 433 $self->{gamelist}->signal_connect(select_row => sub {
410 my $game = $self->{gamelist}->get_row_data($_[1]) 434 my $game = $self->{gamelist}->get_row_data($_[1])
411 or return; 435 or return;
412 $self->{game}{$game->{channel}} ||= new game %$game, conn => $self->{conn}; 436 $self->{game}{$game->{channel}} ||= new game %$game, conn => $self->{conn}, room => $self;
413 $self->{game}{$game->{channel}}->join; 437 $self->{game}{$game->{channel}}->join;
414 $self->{gamelist}->unselect_all; 438 $self->{gamelist}->unselect_all;
415 }); 439 });
416 440
417 $vpane->add(my $vbox = new Gtk::VBox); 441 $vpane->add(my $vbox = new Gtk::VBox);
… …
436 ::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30]; 460 ::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30];
437 461
438 $self; 462 $self;
439} 463}
440 464
465sub join {
466 my ($self) = @_;
467 $self->SUPER::join;
468
469 $self->{window}->show_all;
470}
471
472sub part {
473 my ($self) = @_;
474 $self->SUPER::part;
475
476 delete $::config->{rooms}{$self->{channel}};
477 $self->{window}->hide_all;
478}
479
480sub inject_msg_room {
481 my ($self, $msg) = @_;
482
483 $self->{text}->insert(undef, undef, undef, "\n$msg->{name}: $msg->{message}");
484}
485
441sub event_update_users { 486sub event_update_users {
442 my ($self) = @_; 487 my ($self) = @_;
443 488
489 Gtk->timeout_remove (delete $self->{update_users}) if $self->{update_users};
444 $self->{event_update} ||= Gtk->timeout_add(200, sub { 490 $self->{update_users} ||= Gtk->timeout_add(100, sub {
491 return unless $self->{joined};
492
445 my $l = $self->{userlist}; 493 my $l = $self->{userlist};
446 494
447 $l->freeze; 495 $l->freeze;
448 my $pos = $l->get_vadjustment->get_value; 496 my $pos = $l->get_vadjustment->get_value;
449 $l->clear; 497 $l->clear;
… …
455 } 503 }
456 $l->sort; 504 $l->sort;
457 $l->get_vadjustment->set_value($pos); 505 $l->get_vadjustment->set_value($pos);
458 $l->thaw; 506 $l->thaw;
459 507
460 delete $self->{event_update}; 508 delete $self->{update_users};
461 0;
462 }); 509 });
463} 510}
464 511
465sub event_update_games { 512sub event_update_games {
466 my ($self) = @_; 513 my ($self) = @_;
… …
484 delete $self->{event_update_games}; 531 delete $self->{event_update_games};
485 0; 532 0;
486 }); 533 });
487} 534}
488 535
489sub join {
490 my ($self) = @_;
491 $self->SUPER::join;
492
493 $self->{window}->show_all;
494}
495
496sub part {
497 my ($self) = @_;
498 $self->SUPER::part;
499
500 delete $::config->{rooms}{$self->{channel}};
501 $self->{window}->hide_all;
502 $self->event_update_users;
503 $self->event_update_games;
504}
505
506sub event_join { 536sub event_join {
507 my ($self) = @_; 537 my ($self) = @_;
508 $self->SUPER::event_join; 538 $self->SUPER::event_join;
509 539
510 $::config->{rooms}{$self->{channel}} = 1; 540 $::config->{rooms}{$self->{channel}} = 1;
… …
512 542
513sub event_update_roominfo { 543sub event_update_roominfo {
514 my ($self) = @_; 544 my ($self) = @_;
515 545
516 $self->{text}->insert(undef, undef, undef, "\n$self->{owner}: $self->{description}\n"); 546 $self->{text}->insert(undef, undef, undef, "\n$self->{owner}: $self->{description}\n");
517}
518
519sub inject_msg_room {
520 my ($self, $msg) = @_;
521 return unless $self->{channel} == $msg->{channel};
522
523 $self->{text}->insert(undef, undef, undef, "\n$msg->{name}: $msg->{message}");
524} 547}
525 548
526############################################################################# 549#############################################################################
527 550
528package game; 551package game;
… …
538 $self = $self->SUPER::new(@_); 561 $self = $self->SUPER::new(@_);
539 562
540 $self->listen($self->{conn}); 563 $self->listen($self->{conn});
541 564
542 $self->{window} = new Gtk::Window 'toplevel'; 565 $self->{window} = new Gtk::Window 'toplevel';
543 $self->{window}->set_title("KGS Game ".$self->user0." ".$self->user1) if $self->{channel};#d# 566 my $title = $self->{channel} ? $self->user0." ".$self->user1 : "Game Window";
567 $self->{window}->set_title("KGS Game $title");
544 ::state $self->{window}, "game::window", undef, window_size => [600, 500]; 568 ::state $self->{window}, "game::window", undef, window_size => [600, 500];
545 569
546 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 }); 570 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 });
547 571
548 $self->{window}->add(my $hpane = new Gtk::HPaned); 572 $self->{window}->add(my $hpane = new Gtk::HPaned);
549 ::state $hpane, "game::hpane", undef, hpane_position => 500; 573 ::state $hpane, "game::hpane", undef, hpane_position => 500;
550 574
575 $hpane->pack1(my $vbox = new Gtk::VBox);
576
577 $vbox->pack_start((my $frame = new Gtk::Frame), 0, 1, 0);
578
579 {
580 $frame->add(my $vbox = new Gtk::VBox);
581 $vbox->add($self->{title} = new Gtk::Label $title);
582
583 $self->{moveadj} = new Gtk::Adjustment 0, 0, 0, 1, 10, 0;
584 $vbox->add(my $scale = new Gtk::HScale $self->{moveadj});
585 $scale->set_draw_value (1);
586 $scale->set_digits (0);
587 $scale->set_value_pos('top');
588
589 $self->{moveadj}->signal_connect (value_changed => sub {
590 $self->{board} = new KGS::Game::Board $self->{size};
591 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $self->{moveadj}->value - 1]]);
592
593 my $area = $self->repaint_board;
594
595 # force a redraw (not perfect(?))
596 $self->expose ($area);
597
598 $self->{text}->backward_delete($self->{text}->get_length);
599 $self->{text}->insert(undef, undef, undef, KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
600 });
601
602 $self->{moveadj}->upper (scalar @{$self->{path}}) if $self->{path};
603 }
604
551 Gtk::Widget->push_visual (Gtk::Gdk::Rgb->get_visual); 605 Gtk::Widget->push_visual (Gtk::Gdk::Rgb->get_visual);
552 Gtk::Widget->push_colormap (Gtk::Gdk::Rgb->get_cmap); 606 Gtk::Widget->push_colormap (Gtk::Gdk::Rgb->get_cmap);
553 $hpane->pack1(($self->{canvas} = new Gtk::DrawingArea), 1, 1); 607 $vbox->pack_start(($self->{canvas} = new Gtk::DrawingArea), 1, 1, 0);
554 Gtk::Widget->pop_colormap; 608 Gtk::Widget->pop_colormap;
555 Gtk::Widget->pop_visual; 609 Gtk::Widget->pop_visual;
556 610
557 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 611 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
558 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 612 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
… …
605} 659}
606 660
607sub configure_event { 661sub configure_event {
608 my ($widget, $self, $event) = @_; 662 my ($widget, $self, $event) = @_;
609 delete $self->{stack}; 663 delete $self->{stack};
664 delete $self->{pixbuf};
665 delete $self->{board_shown};
610 delete $self->{background}; 666 delete $self->{background};
611 $self->repaint_board; 667 $self->repaint_board;
612 1; 668 1;
613} 669}
614 670
… …
646 702
647# create a stack of stones 703# create a stack of stones
648sub create_stack { 704sub create_stack {
649 my ($self, $mark, $size, $rand) = @_; 705 my ($self, $mark, $size, $rand) = @_;
650 706
651 my $shadow = $size * 0.06; 707 my $shadow = $size * 0.05;
652 708
653 my $c = \$self->{stack}{$mark}; 709 my $c = \$self->{stack}{$mark};
654 unless ($$c) { 710 unless ($$c) {
655 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 711 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
656 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 1; 712 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 1;
… …
658 # zeroeth the shadow 714 # zeroeth the shadow
659 if ($mark & (MARK_B | MARK_W)) { 715 if ($mark & (MARK_B | MARK_W)) {
660 $::black_img[0]->composite ( 716 $::black_img[0]->composite (
661 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, 717 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5,
662 $size / $stone->get_width, $size / $stone->get_height, 718 $size / $stone->get_width, $size / $stone->get_height,
663 $::config{speed} ? INTERP_NEAREST : INTERP_TILES, 128 719 $::config->{speed} ? INTERP_NEAREST : INTERP_TILES, 128
664 ); 720 );
665 } 721 }
666 722
667 # first the big stones 723 # first the big stones (handicap stones different for effect)
668 for ([MARK_B, 255], 724 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
669 [MARK_W, 255], 725 [MARK_W, $mark & MARK_MOVE ? 255 : 192],
670 [MARK_GRAY_B, 128], 726 [MARK_GRAY_B, 128],
671 [MARK_GRAY_W, 128]) { 727 [MARK_GRAY_W, 128]) {
672 my ($mask, $alpha) = @$_; 728 my ($mask, $alpha) = @$_;
673 if ($mark & $mask) { 729 if ($mark & $mask) {
674 $stone->composite ( 730 $stone->composite (
675 $base, 0, 0, $size, $size, -0.5, -0.5, 731 $base, 0, 0, $size, $size, -0.5, -0.5,
676 $size / $stone->get_width, $size / $stone->get_height, 732 $size / $stone->get_width, $size / $stone->get_height,
677 $::config{speed} ? INTERP_NEAREST : INTERP_HYPER, $alpha 733 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, $alpha
678 ); 734 );
679 } 735 }
680 } 736 }
681 737
682 # then the samll stones 738 # then the samll stones
… …
685 my ($mask, $img) = @$_; 741 my ($mask, $img) = @$_;
686 if ($mark & $mask) { 742 if ($mark & $mask) {
687 $img->composite ( 743 $img->composite (
688 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2, 744 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2,
689 $size / $img->get_width / 2, $size / $img->get_height / 2, 745 $size / $img->get_width / 2, $size / $img->get_height / 2,
690 $::config{speed} ? INTERP_NEAREST : INTERP_HYPER, 192 746 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 192
691 ); 747 );
692 } 748 }
693 } 749 }
694 750
695 # and lastly any markers (labels NYI) 751 # and lastly any markers
696 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B)); 752 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
697 753
698 for ([MARK_CIRCLE, $::circle_img[$dark_bg]], 754 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
699 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 755 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
700 [MARK_SQUARE, $::square_img[$dark_bg]]) { 756 [MARK_SQUARE, $::square_img[$dark_bg]]) {
701 my ($mask, $img) = @$_; 757 my ($mask, $img) = @$_;
702 if ($mark & $mask) { 758 if ($mark & $mask) {
703 $img->composite ( 759 $img->composite (
704 $base, 0, 0, $size, $size, -0.5, -0.5, 760 $base, 0, 0, $size, $size, -0.5, -0.5,
705 $size / $img->get_width, $size / $img->get_height, 761 $size / $img->get_width, $size / $img->get_height,
706 $::config{speed} ? INTERP_NEAREST : INTERP_HYPER, 255 762 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 255
707 ); 763 );
708 } 764 }
709 } 765 }
710 766
711 push @$$c, $base; 767 push @$$c, $base;
… …
716} 772}
717 773
718sub pixbuf_text { 774sub pixbuf_text {
719 my ($pixbuf, $colour, $x, $y, $height, $text) = @_; 775 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
720 776
721 my $c = $::font[$colour][$::fontmap{substr $text, 0, 1}]; 777 my @c = grep $_,
778 map $::font[$colour][$::fontmap{$_}],
779 split //, $text;
722 780
723 if ($c) { 781 if (@c) {
724 my ($w, $h) = ($c->get_width, $c->get_height); 782 my $spacing = $height * 0.1;
725 my $s = ($height-1) / ($h-1); 783 my $s = $height / List::Util::max map $_->get_height, @c;
784 my $W = List::Util::sum map $_->get_width, @c;
726 785
727 $x -= $w * $s * 0.5; 786 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
728 $y -= $height * 0.5; 787 $y -= $height * 0.5;
729 788
789 for (@c) {
790 my $w = $_->get_width * $s;
730 $c->composite ($pixbuf, 791 $_->composite ($pixbuf,
731 $x, $y, $w*$s+0.5, $height+0.5, $x-0.5, $y-0.5, $s, $s, 792 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s,
732 $::config{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192); 793 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
733 794
734 } else { 795 $x += $w + $spacing;
735 warn "unable to render character '$text'"; 796 }
736 } 797 }
737} 798}
738 799
739my $black_pb; 800my $black_pb;
740 801
… …
750} 811}
751 812
752sub repaint_board { 813sub repaint_board {
753 my ($self) = @_; 814 my ($self) = @_;
754 my $canvas = $self->{canvas}; 815 my $canvas = $self->{canvas};
816 my $expose_area = undef;
755 817
756 return unless $self->{board}; 818 return $expose_area unless $self->{board};
757 819
758 my ($w, $h) = @{$canvas->allocation}[2,3]; 820 my ($w, $h) = @{$canvas->allocation}[2,3];
759 821
760 my $s = $w > $h ? $h : $w; 822 my $s = $w > $h ? $h : $w;
761 823
762 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s]; 824 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
763 825
764 my $size = $self->{size}; 826 my $size = $self->{size};
765 827
766 my $border = int ($s / $size); 828 my $border = int ($s / ($size + 3) * 0.5);
767 my $s2 = $s - $border * 2; 829 my $s2 = $s - $border * 2;
768 my $edge = int ($s2 / $size * 0.97); 830 my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0);
769 my $ofs = int ($edge / 2); 831 my $ofs = int ($edge / 2);
770 832
771 my @k = map int ($s2 * $_ / $size - $ofs + $border + 0.5), 0 .. $size; 833 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
772 834
773 my $pixbuf; 835 my $pixbuf;
774 836
837 my $oldboard;
838
775 if ($self->{background}) { 839 if ($self->{background}) {
840 if ($oldboard = $self->{board_shown}) {
841 $pixbuf = $self->{pixbuf};
842 } else {
776 $pixbuf = $self->{background}->copy; 843 $pixbuf = $self->{background}->copy;
844 $expose_area = [0, 0, $s, $s];
845 }
777 } else { 846 } else {
847 $expose_area = [0, 0, $s, $s];
848
778 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); 849 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
779 850
780 if ($s < $bw && $s < $bh) { 851 if ($s < $bw && $s < $bh) {
781 $pixbuf = new_pixbuf $s, $s, $::config{conserve_memory} ? 0 : 1, 0; 852 $pixbuf = new_pixbuf $s, $s, $::config->{conserve_memory} ? 0 : 1, 0;
782 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 853 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
783 } else { 854 } else {
784 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config{speed} ? INTERP_NEAREST : INTERP_TILES; 855 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
785 } 856 }
786 857
787 my $linew = int ($s / 500); 858 my $linew = int ($s / 25 / $size);
788 859
789 my $a = "A";
790 for my $i (1 .. $size) { 860 for my $i (1 .. $size) {
791 pixbuf_rect $pixbuf, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew; 861 pixbuf_rect $pixbuf, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew;
792 pixbuf_rect $pixbuf, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew; 862 pixbuf_rect $pixbuf, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew;
793 863
864 # 38 max, but we allow a bit more
865 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
866 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];
867
794 pixbuf_text $pixbuf, 0, $k[$i], ($ofs +$border) / 2, $ofs, $a; 868 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
795 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border + $ofs / 2, $ofs, $a; 869 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
796 pixbuf_text $pixbuf, 0, ($ofs + $border) / 2, $k[$i], $ofs, $size - $i + 1; 870 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
797 pixbuf_text $pixbuf, 0, $s2 + $border + $ofs / 2, $k[$i], $ofs, $size - $i + 1; 871 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
798 872
799 $a++; 873 $a++;
800 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 874 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
801 } 875 }
802 876
… …
811 # hoshi-points(!)#d# 885 # hoshi-points(!)#d#
812 # caching of empty board gfx(!)#d# 886 # caching of empty board gfx(!)#d#
813 887
814 for my $x (1 .. $size) { 888 for my $x (1 .. $size) {
815 for my $y (1 .. $size) { 889 for my $y (1 .. $size) {
890 my $rand = ($x ^ $y ^ 0x5555);
891
892 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
893
894 if ($::config->{randomize}) {
895 $dx += ($rand % 7) - 3;
896 $dy += ($rand / 3 % 7) - 3;
897 }
898
899 my $shadow = $edge * 0.05;
900 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
901
816 my $mark = $self->{board}{board}[$x-1][$y-1]; 902 my $mark = $self->{board}{board}[$x-1][$y-1];
903 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
904
905 if ($oldboard) {
906 next if $old == $mark; # no change
907
908 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
909 $expose_area = $expose_area
910 ? Gtk::Gdk::Rectangle->union ($expose_area, $area)
911 : $area;
912 }
817 913
818 if ($mark) { 914 if ($mark) {
819 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
820 my $pb = $self->create_stack($mark, $edge, $x * 17 + $y * 11 ); 915 my $pb = $self->create_stack($mark, $edge, $rand);
821 916
822 $pb->composite ($pixbuf, $dx, $dy, $pb->get_width, $pb->get_height, 917 $pb->composite ($pixbuf, @$area,
823 $dx, $dy, 1, 1, $::config{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255); 918 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
919
920 # labels are handled here because they are quite rare
921 if ($mark & MARK_LABEL) {
922 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
923
924 if ($white) {
925 pixbuf_text $pixbuf, 0,
926 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
927 $self->{board}{label}[$x-1][$y-1];
928 }
929 pixbuf_text $pixbuf, $white,
930 $k[$x], $k[$y], $ofs * 0.7,
931 $self->{board}{label}[$x-1][$y-1];
932 }
824 933
934 # old pixmap&mask-way. that was fast ;(
825 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 ); 935 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
826 936
827 #$gc->set_clip_mask ($bm); 937 #$gc->set_clip_mask ($bm);
828 #$gc->set_clip_origin ($dx, $dy); 938 #$gc->set_clip_origin ($dx, $dy);
829 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge); 939 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
830 } 940 }
831 } 941 }
832 } 942 }
833}
834 943
944 $self->{board_shown} = Storable::dclone $self->{board};
945 #d# save
946 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
947
948 $expose_area;
949}
950
835sub expose_event { 951sub expose {
836 my ($widget, $self, $event) = @_; 952 my ($self, $area) = @_;
837 953
838 $self->{pixbuf} or return; 954 if ($area && $self->{pixbuf}) {
839 955 my ($x, $y, $w, $h) = @$area;
840 my ($ox, $oy, $s) = @{$self->{offsets}}; 956 my ($ox, $oy, $s) = @{$self->{offsets}};
841 957
842 my ($x, $y, $w, $h) =
843 @{Gtk::Gdk::Rectangle->intersect(
844 $event->{area},
845 [$ox, $oy, $s, $s]
846 )};
847
848 if (defined $x) {
849 $self->{pixbuf}->render_to_drawable ($self->{canvas}->window, $self->{canvas}->style->white_gc, 958 $self->{pixbuf}->render_to_drawable ($self->{canvas}->window, $self->{canvas}->style->white_gc,
850 $x - $ox, $y - $oy, $x, $y, $w, $h); 959 $x, $y, $x + $ox, $y + $oy, $w, $h);
960 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
961 $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
962
851 #$self->{canvas}->window->draw_pixmap ( 963 #$self->{canvas}->window->draw_pixmap (
852 # $self->{canvas}->style->white_gc, 964 # $self->{canvas}->style->white_gc,
853 # $self->{pixmap}, 965 # $self->{pixmap},
854 # $x - $ox, $y - $oy, $x, $y, $w, $h, 966 # $x - $ox, $y - $oy, $x, $y, $w, $h,
855 #); 967 #);
856 } 968 }
969}
970
971sub expose_event {
972 my ($widget, $self, $event) = @_;
973
974 $self->{pixbuf} or return;
975
976 my $area = $event->{area};
977 my ($ox, $oy, $s) = @{$self->{offsets}};
978
979 $self->expose (Gtk::Gdk::Rectangle->intersect (
980 [$area->[0] - $ox, $area->[1] - $oy, $area->[2], $area->[3]],
981 [0, 0, $s, $s],
982 ));
983
857 1; 984 1;
858} 985}
859 986
860sub event_update_tree { 987sub event_update_tree {
861 my ($self) = @_; 988 my ($self) = @_;
862 989
863 $self->{board} = new KGS::Game::Board $self->{size}; 990 $self->{path} = $self->get_path;
864 $self->{board}->interpret_path ($self->get_path); 991
992 my $move = @{$self->{path}};
865 993
866 $self->repaint_board; 994 $self->{moveadj}->upper($move);
867 995
868 # force a redraw (not perfect(?)) 996 if ($self->{moveadj}->value >= $move - 1 || !$self->{moveadj}->value) {
869 expose_event $self->{canvas}, $self, { area => $self->{canvas}->allocation }; 997 $self->{moveadj}->value ($move);
998 $self->{moveadj}->value_changed;
999 }
1000}
870 1001
871 $self->{text}->backward_delete($self->{text}->get_length); 1002sub event_part {
872 $self->{text}->insert(undef, undef, undef, KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment}); 1003 my ($self) = @_;
1004 $self->SUPER::event_part;
1005 (delete $self->{window})->destroy; # hmm.. why does this keep the object alive? puzzling.. ahh.. the callbacks ;)
1006 delete $self->{room}{game}{$self->{channel}};
873} 1007}
874 1008
875sub event_move { 1009sub event_move {
876 ::play_sound "move"; 1010 my ($self, $pass) = @_;
1011 ::play_sound 1, $pass ? "pass" : "move";
1012}
1013
1014sub DESTROY {#d#
1015 warn "DESTROY(@_)\n";#d#
877} 1016}
878 1017
8791; 10181;
880 1019
881 1020

Diff Legend

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