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

Comparing kgsueme/bin/kgsueme (file contents):
Revision 1.25 by pcg, Fri May 30 15:50:20 2003 UTC vs.
Revision 1.30 by pcg, Sat May 31 05:35:48 2003 UTC

… …
15use List::Util; 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;
21 22
22if ($HACK) { 23if ($HACK) {
23 $KGS::debug = 1; 24 $KGS::debug = 1;
24} 25}
26
27our $VERSION = "0.1";
25 28
26our $config; 29our $config;
27our $LIBDIR = "."; 30our $LIBDIR = ".";
28our $IMGDIR = "$LIBDIR/images"; 31our $IMGDIR = "$LIBDIR/images";
29our $SNDDIR = "$LIBDIR/sounds"; 32our $SNDDIR = "$LIBDIR/sounds";
… …
54{ 57{
55 #my $audioserver = new Audio::Play(0); 58 #my $audioserver = new Audio::Play(0);
56 my %sound; 59 my %sound;
57 $SIG{CHLD} = 'IGNORE'; 60 $SIG{CHLD} = 'IGNORE';
58 61
59 for (qw(alarm warning move)) { 62 for (qw(alarm warning move pass ring connect user_unknown)) {
60 local $/; 63 local $/;
61 open my $snd, "<", "$SNDDIR/$_" 64 open my $snd, "<", "$SNDDIR/$_"
62 or die "$SNDDIR: $!"; 65 or die "$SNDDIR/$_: $!";
63 binmode $snd; 66 binmode $snd;
64 67
65 $sound{$_} = new Audio::Data; 68 $sound{$_} = new Audio::Data;
66 $sound{$_}->Load($snd); 69 $sound{$_}->Load($snd);
67 } 70 }
68 71
69 sub play_sound { 72 sub play_sound {
73 my ($annoyancy, $sound) = @_;
74 # annoyany 1 => important, annoyance 2 => useful, annoyancy 3 => not useful
70 if (fork == 0) { 75 if (fork == 0) {
71 if (my $audioserver = new Audio::Play(1)) { 76 if (my $audioserver = new Audio::Play(1)) {
72 $audioserver->play ($sound{$_[0]}); 77 $audioserver->play ($sound{$sound});
73 } 78 }
74 Gtk->_exit(0); 79 Gtk->_exit(0);
75 } 80 }
76 } 81 }
77} 82}
… …
85 my $state = -r $staterc ? Storable::retrieve($staterc) : {}; 90 my $state = -r $staterc ? Storable::retrieve($staterc) : {};
86 my @widgets; 91 my @widgets;
87 92
88 $config = $state->{config} ||= {}; 93 $config = $state->{config} ||= {};
89 94
90 $config{speed} = 1;#d# optimize for speed or memory? 95 $config->{speed} = 1;#d# optimize for speed or memory?
91 $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
92 98
93 # grr... more gtk+ brokenness 99 # grr... more gtk+ brokenness
94 my %get = ( 100 my %get = (
95 hpane_position => sub { ($_[0]->children)[0]->allocation->[2] }, 101 hpane_position => sub { ($_[0]->children)[0]->allocation->[2] },
96 vpane_position => sub { ($_[0]->children)[0]->allocation->[3] }, 102 vpane_position => sub { ($_[0]->children)[0]->allocation->[3] },
… …
187 193
188if (0) { 194if (0) {
189 use KGS::Constants; 195 use KGS::Constants;
190 196
191 for (19) { 197 for (19) {
192 my $board = new game size => $_; 198 my $board = new game %{Storable::retrieve "testboard.storable"};
199
200 if (0) {
193 $board->{board} = new KGS::Game::Board; 201 $board->{board} = new KGS::Game::Board;
194 $board->{board}{board}[0][0] = MARK_B; 202 $board->{board}{board}[0][0] = MARK_B;
195 $board->{board}{board}[1][1] = MARK_GRAY_B | MARK_SMALL_W; 203 $board->{board}{board}[1][1] = MARK_GRAY_B | MARK_SMALL_W;
196 $board->{board}{board}[2][2] = MARK_W | MARK_TRIANGLE; 204 $board->{board}{board}[2][2] = MARK_W | MARK_TRIANGLE;
197 $board->{board}{board}[1][2] = MARK_B | MARK_LABEL; 205 $board->{board}{board}[1][2] = MARK_B | MARK_LABEL;
198 $board->{board}{label}[1][2] = "198"; 206 $board->{board}{label}[1][2] = "198";
199 $board->{board}{board}[0][2] = MARK_W | MARK_LABEL; 207 $board->{board}{board}[0][2] = MARK_W | MARK_LABEL;
200 $board->{board}{label}[0][2] = "AWA"; 208 $board->{board}{label}[0][2] = "AWA";
209 }
201 $board->{window}->show_all; 210 $board->{window}->show_all;
202 } 211 }
203} 212}
204 213
205main Gtk; 214main Gtk;
… …
214 my $self = shift; 223 my $self = shift;
215 $self = $self->SUPER::new(@_); 224 $self = $self->SUPER::new(@_);
216 225
217 $self->{conn} = new KGS::Protocol; 226 $self->{conn} = new KGS::Protocol;
218 227
219 KGS::Listener::Debug->new->listen($self->{conn}); #d# debug only :) 228 KGS::Listener::Debug->new->listen($self->{conn}, "any"); #d# debug only :)
220 229
221 $self->listen($self->{conn}, "login"); 230 $self->listen($self->{conn}, "login");
222 231
223 $self->{roomlist} = new roomlist conn => $self->{conn}; 232 $self->{roomlist} = new roomlist conn => $self->{conn};
224 233
… …
289 } 298 }
290 $self->{conn}->feed_data($buf); 299 $self->{conn}->feed_data($buf);
291 }; 300 };
292 301
293 # now login 302 # now login
294 $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);
295} 304}
296 305
297sub inject_login { 306sub inject_login {
298 my ($self, $msg) = @_; 307 my ($self, $msg) = @_;
299 308
… …
302 311
303 if ($msg->{success}) { 312 if ($msg->{success}) {
304 for (keys %{$::config->{rooms}}) { 313 for (keys %{$::config->{rooms}}) {
305 $self->{roomlist}->join_room($_); 314 $self->{roomlist}->join_room($_);
306 } 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";
307 } 321 }
308} 322}
309 323
310sub event_disconnect { } 324sub event_disconnect { }
311 325
… …
417 ::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];
418 432
419 $self->{gamelist}->signal_connect(select_row => sub { 433 $self->{gamelist}->signal_connect(select_row => sub {
420 my $game = $self->{gamelist}->get_row_data($_[1]) 434 my $game = $self->{gamelist}->get_row_data($_[1])
421 or return; 435 or return;
422 $self->{game}{$game->{channel}} ||= new game %$game, conn => $self->{conn}; 436 $self->{game}{$game->{channel}} ||= new game %$game, conn => $self->{conn}, room => $self;
423 $self->{game}{$game->{channel}}->join; 437 $self->{game}{$game->{channel}}->join;
424 $self->{gamelist}->unselect_all; 438 $self->{gamelist}->unselect_all;
425 }); 439 });
426 440
427 $vpane->add(my $vbox = new Gtk::VBox); 441 $vpane->add(my $vbox = new Gtk::VBox);
… …
459 my ($self) = @_; 473 my ($self) = @_;
460 $self->SUPER::part; 474 $self->SUPER::part;
461 475
462 delete $::config->{rooms}{$self->{channel}}; 476 delete $::config->{rooms}{$self->{channel}};
463 $self->{window}->hide_all; 477 $self->{window}->hide_all;
464 $self->event_update_users;
465 $self->event_update_games;
466} 478}
467 479
468sub inject_msg_room { 480sub inject_msg_room {
469 my ($self, $msg) = @_; 481 my ($self, $msg) = @_;
470 482
… …
472} 484}
473 485
474sub event_update_users { 486sub event_update_users {
475 my ($self) = @_; 487 my ($self) = @_;
476 488
489 Gtk->timeout_remove (delete $self->{update_users}) if $self->{update_users};
477 $self->{event_update} ||= Gtk->timeout_add(200, sub { 490 $self->{update_users} ||= Gtk->timeout_add(100, sub {
491 return unless $self->{joined};
492
478 my $l = $self->{userlist}; 493 my $l = $self->{userlist};
479 494
480 $l->freeze; 495 $l->freeze;
481 my $pos = $l->get_vadjustment->get_value; 496 my $pos = $l->get_vadjustment->get_value;
482 $l->clear; 497 $l->clear;
… …
488 } 503 }
489 $l->sort; 504 $l->sort;
490 $l->get_vadjustment->set_value($pos); 505 $l->get_vadjustment->set_value($pos);
491 $l->thaw; 506 $l->thaw;
492 507
493 delete $self->{event_update}; 508 delete $self->{update_users};
494 0;
495 }); 509 });
496} 510}
497 511
498sub event_update_games { 512sub event_update_games {
499 my ($self) = @_; 513 my ($self) = @_;
… …
574 588
575 $self->{moveadj}->signal_connect (value_changed => sub { 589 $self->{moveadj}->signal_connect (value_changed => sub {
576 $self->{board} = new KGS::Game::Board $self->{size}; 590 $self->{board} = new KGS::Game::Board $self->{size};
577 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $self->{moveadj}->value - 1]]); 591 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $self->{moveadj}->value - 1]]);
578 592
579 $self->repaint_board; 593 my $area = $self->repaint_board;
580 594
581 # force a redraw (not perfect(?)) 595 # force a redraw (not perfect(?))
582 expose_event($self->{canvas}, $self, { area => [0, 0, @{$self->{canvas}->allocation}[2,3]] }); 596 $self->expose ($area);
583 597
584 $self->{text}->backward_delete($self->{text}->get_length); 598 $self->{text}->backward_delete($self->{text}->get_length);
585 $self->{text}->insert(undef, undef, undef, KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment}); 599 $self->{text}->insert(undef, undef, undef, KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
586 }); 600 });
601
602 $self->{moveadj}->upper (scalar @{$self->{path}}) if $self->{path};
587 } 603 }
588 604
589 Gtk::Widget->push_visual (Gtk::Gdk::Rgb->get_visual); 605 Gtk::Widget->push_visual (Gtk::Gdk::Rgb->get_visual);
590 Gtk::Widget->push_colormap (Gtk::Gdk::Rgb->get_cmap); 606 Gtk::Widget->push_colormap (Gtk::Gdk::Rgb->get_cmap);
591 $vbox->pack_start(($self->{canvas} = new Gtk::DrawingArea), 1, 1, 0); 607 $vbox->pack_start(($self->{canvas} = new Gtk::DrawingArea), 1, 1, 0);
… …
643} 659}
644 660
645sub configure_event { 661sub configure_event {
646 my ($widget, $self, $event) = @_; 662 my ($widget, $self, $event) = @_;
647 delete $self->{stack}; 663 delete $self->{stack};
664 delete $self->{pixbuf};
665 delete $self->{board_shown};
648 delete $self->{background}; 666 delete $self->{background};
649 $self->repaint_board; 667 $self->repaint_board;
650 1; 668 1;
651} 669}
652 670
… …
684 702
685# create a stack of stones 703# create a stack of stones
686sub create_stack { 704sub create_stack {
687 my ($self, $mark, $size, $rand) = @_; 705 my ($self, $mark, $size, $rand) = @_;
688 706
689 my $shadow = $size * 0.06; 707 my $shadow = $size * 0.05;
690 708
691 my $c = \$self->{stack}{$mark}; 709 my $c = \$self->{stack}{$mark};
692 unless ($$c) { 710 unless ($$c) {
693 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) {
694 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 1; 712 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 1;
… …
696 # zeroeth the shadow 714 # zeroeth the shadow
697 if ($mark & (MARK_B | MARK_W)) { 715 if ($mark & (MARK_B | MARK_W)) {
698 $::black_img[0]->composite ( 716 $::black_img[0]->composite (
699 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, 717 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5,
700 $size / $stone->get_width, $size / $stone->get_height, 718 $size / $stone->get_width, $size / $stone->get_height,
701 $::config{speed} ? INTERP_NEAREST : INTERP_TILES, 128 719 $::config->{speed} ? INTERP_NEAREST : INTERP_TILES, 128
702 ); 720 );
703 } 721 }
704 722
705 # first the big stones 723 # first the big stones (handicap stones different for effect)
706 for ([MARK_B, 255], 724 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
707 [MARK_W, 255], 725 [MARK_W, $mark & MARK_MOVE ? 255 : 192],
708 [MARK_GRAY_B, 128], 726 [MARK_GRAY_B, 128],
709 [MARK_GRAY_W, 128]) { 727 [MARK_GRAY_W, 128]) {
710 my ($mask, $alpha) = @$_; 728 my ($mask, $alpha) = @$_;
711 if ($mark & $mask) { 729 if ($mark & $mask) {
712 $stone->composite ( 730 $stone->composite (
713 $base, 0, 0, $size, $size, -0.5, -0.5, 731 $base, 0, 0, $size, $size, -0.5, -0.5,
714 $size / $stone->get_width, $size / $stone->get_height, 732 $size / $stone->get_width, $size / $stone->get_height,
715 $::config{speed} ? INTERP_NEAREST : INTERP_HYPER, $alpha 733 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, $alpha
716 ); 734 );
717 } 735 }
718 } 736 }
719 737
720 # then the samll stones 738 # then the samll stones
… …
723 my ($mask, $img) = @$_; 741 my ($mask, $img) = @$_;
724 if ($mark & $mask) { 742 if ($mark & $mask) {
725 $img->composite ( 743 $img->composite (
726 $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,
727 $size / $img->get_width / 2, $size / $img->get_height / 2, 745 $size / $img->get_width / 2, $size / $img->get_height / 2,
728 $::config{speed} ? INTERP_NEAREST : INTERP_HYPER, 192 746 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 192
729 ); 747 );
730 } 748 }
731 } 749 }
732 750
733 # and lastly any markers (labels NYI) 751 # and lastly any markers
734 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B)); 752 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
735 753
736 for ([MARK_CIRCLE, $::circle_img[$dark_bg]], 754 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
737 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 755 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
738 [MARK_SQUARE, $::square_img[$dark_bg]]) { 756 [MARK_SQUARE, $::square_img[$dark_bg]]) {
739 my ($mask, $img) = @$_; 757 my ($mask, $img) = @$_;
740 if ($mark & $mask) { 758 if ($mark & $mask) {
741 $img->composite ( 759 $img->composite (
742 $base, 0, 0, $size, $size, -0.5, -0.5, 760 $base, 0, 0, $size, $size, -0.5, -0.5,
743 $size / $img->get_width, $size / $img->get_height, 761 $size / $img->get_width, $size / $img->get_height,
744 $::config{speed} ? INTERP_NEAREST : INTERP_HYPER, 255 762 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 255
745 ); 763 );
746 } 764 }
747 } 765 }
748 766
749 push @$$c, $base; 767 push @$$c, $base;
… …
770 788
771 for (@c) { 789 for (@c) {
772 my $w = $_->get_width * $s; 790 my $w = $_->get_width * $s;
773 $_->composite ($pixbuf, 791 $_->composite ($pixbuf,
774 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, 792 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s,
775 $::config{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 793 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
776 794
777 $x += $w + $spacing; 795 $x += $w + $spacing;
778 } 796 }
779 } 797 }
780} 798}
… …
793} 811}
794 812
795sub repaint_board { 813sub repaint_board {
796 my ($self) = @_; 814 my ($self) = @_;
797 my $canvas = $self->{canvas}; 815 my $canvas = $self->{canvas};
816 my $expose_area = undef;
798 817
799 return unless $self->{board}; 818 return $expose_area unless $self->{board};
800 819
801 my ($w, $h) = @{$canvas->allocation}[2,3]; 820 my ($w, $h) = @{$canvas->allocation}[2,3];
802 821
803 my $s = $w > $h ? $h : $w; 822 my $s = $w > $h ? $h : $w;
804 823
… …
806 825
807 my $size = $self->{size}; 826 my $size = $self->{size};
808 827
809 my $border = int ($s / ($size + 3) * 0.5); 828 my $border = int ($s / ($size + 3) * 0.5);
810 my $s2 = $s - $border * 2; 829 my $s2 = $s - $border * 2;
811 my $edge = int ($s2 / ($size + 1) * 0.97); 830 my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0);
812 my $ofs = int ($edge / 2); 831 my $ofs = int ($edge / 2);
813 832
814 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; 833 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
815 834
816 my $pixbuf; 835 my $pixbuf;
817 836
837 my $oldboard;
838
818 if ($self->{background}) { 839 if ($self->{background}) {
840 if ($oldboard = $self->{board_shown}) {
841 $pixbuf = $self->{pixbuf};
842 } else {
819 $pixbuf = $self->{background}->copy; 843 $pixbuf = $self->{background}->copy;
844 $expose_area = [0, 0, $s, $s];
845 }
820 } else { 846 } else {
847 $expose_area = [0, 0, $s, $s];
848
821 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); 849 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
822 850
823 if ($s < $bw && $s < $bh) { 851 if ($s < $bw && $s < $bh) {
824 $pixbuf = new_pixbuf $s, $s, $::config{conserve_memory} ? 0 : 1, 0; 852 $pixbuf = new_pixbuf $s, $s, $::config->{conserve_memory} ? 0 : 1, 0;
825 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 853 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
826 } else { 854 } else {
827 $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;
828 } 856 }
829 857
830 my $linew = int ($s / 25 / $size); 858 my $linew = int ($s / 25 / $size);
831 859
832 for my $i (1 .. $size) { 860 for my $i (1 .. $size) {
… …
857 # hoshi-points(!)#d# 885 # hoshi-points(!)#d#
858 # caching of empty board gfx(!)#d# 886 # caching of empty board gfx(!)#d#
859 887
860 for my $x (1 .. $size) { 888 for my $x (1 .. $size) {
861 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
862 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 }
863 913
864 if ($mark) { 914 if ($mark) {
865 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
866 my $pb = $self->create_stack($mark, $edge, $x * 17 + $y * 11 ); 915 my $pb = $self->create_stack($mark, $edge, $rand);
867 916
868 $pb->composite ($pixbuf, $dx, $dy, $pb->get_width, $pb->get_height, 917 $pb->composite ($pixbuf, @$area,
869 $dx, $dy, 1, 1, $::config{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255); 918 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
870 919
871 # labels are handled here because they are quite rare 920 # labels are handled here because they are quite rare
872 if ($mark & MARK_LABEL) { 921 if ($mark & MARK_LABEL) {
873 pixbuf_text $pixbuf, $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1, 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,
874 $k[$x], $k[$y], $ofs * 0.7, 930 $k[$x], $k[$y], $ofs * 0.7,
875 $self->{board}{label}[$x-1][$y-1]; 931 $self->{board}{label}[$x-1][$y-1];
876 } 932 }
877 933
934 # old pixmap&mask-way. that was fast ;(
878 #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 );
879 936
880 #$gc->set_clip_mask ($bm); 937 #$gc->set_clip_mask ($bm);
881 #$gc->set_clip_origin ($dx, $dy); 938 #$gc->set_clip_origin ($dx, $dy);
882 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge); 939 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
883 } 940 }
884 } 941 }
885 } 942 }
886}
887 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
888sub expose_event { 951sub expose {
889 my ($widget, $self, $event) = @_; 952 my ($self, $area) = @_;
890 953
891 $self->{pixbuf} or return; 954 if ($area && $self->{pixbuf}) {
892 955 my ($x, $y, $w, $h) = @$area;
893 my ($ox, $oy, $s) = @{$self->{offsets}}; 956 my ($ox, $oy, $s) = @{$self->{offsets}};
894 957
895 my ($x, $y, $w, $h) =
896 @{Gtk::Gdk::Rectangle->intersect(
897 $event->{area},
898 [$ox, $oy, $s, $s]
899 )};
900
901 if (defined $x) {
902 $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,
903 $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
904 #$self->{canvas}->window->draw_pixmap ( 963 #$self->{canvas}->window->draw_pixmap (
905 # $self->{canvas}->style->white_gc, 964 # $self->{canvas}->style->white_gc,
906 # $self->{pixmap}, 965 # $self->{pixmap},
907 # $x - $ox, $y - $oy, $x, $y, $w, $h, 966 # $x - $ox, $y - $oy, $x, $y, $w, $h,
908 #); 967 #);
909 } 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
910 1; 984 1;
911} 985}
912 986
913sub event_update_tree { 987sub event_update_tree {
914 my ($self) = @_; 988 my ($self) = @_;
… …
918 my $move = @{$self->{path}}; 992 my $move = @{$self->{path}};
919 993
920 $self->{moveadj}->upper($move); 994 $self->{moveadj}->upper($move);
921 995
922 if ($self->{moveadj}->value >= $move - 1 || !$self->{moveadj}->value) { 996 if ($self->{moveadj}->value >= $move - 1 || !$self->{moveadj}->value) {
923 $self->{moveadj}->set_value ($move); 997 $self->{moveadj}->value ($move);
998 $self->{moveadj}->value_changed;
924 } 999 }
1000}
1001
1002sub event_part {
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}};
925} 1007}
926 1008
927sub event_move { 1009sub event_move {
928 ::play_sound "move"; 1010 my ($self, $pass) = @_;
1011 ::play_sound 1, $pass ? "pass" : "move";
1012}
1013
1014sub DESTROY {#d#
1015 warn "DESTROY(@_)\n";#d#
929} 1016}
930 1017
9311; 10181;
932 1019
933 1020

Diff Legend

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