[ViewVC] Diff of: cvs/Gtk2-GoBoard/GoBoard.pm

Comparing Gtk2-GoBoard/GoBoard.pm (file contents):
Revision 1.5 by root, Wed Jun 25 04:41:10 2008 UTC vs.
Revision 1.14 by root, Tue Jul 29 10:13:05 2008 UTC

 =over 4
 =cut
-our $VERSION = '1.0';
+our $VERSION = '1.01';
 no warnings;
 use strict;
 use Scalar::Util;
      @triangle_img, @square_img, @circle_img, @cross_img);
 sub load_images {
    $board_img    =       load_image "woodgrain-01.jpg";
    @black_img    =       load_image "b-01.png";
-   @white_img    = map +(load_image "w-0$_.png"), 1,2,3,4,5;
+   @white_img    = map +(load_image "w-0$_.png"), 1 .. 5;
-   $shadow_img   =       load_image "shadow.png";
+   $shadow_img   =       load_image "shadow.png"; # also used to fake hoshi points
    @triangle_img = map +(load_image "triangle-$_.png"), qw(b w);
    @square_img   = map +(load_image "square-$_.png"  ), qw(b w);
    @circle_img   = map +(load_image "circle-$_.png"  ), qw(b w);
    @cross_img    = map +(load_image "cross-$_.png"   ), qw(b w);
 }
    delete $self->{backgroundpm};
    delete $self->{backgroundpb};
    my $pixmap = new Gtk2::Gdk::Pixmap $self->window, $w, $h, -1;
-   #my $gridcolour  = 0x88444400; # black is traditional, but only with overlapping stones
    my $gridcolour  = 0x44444400; # black is traditional, but only with overlapping stones
    my $labelcolour = 0x88444400;
-   # we leave enough space for the shadows.. I like smaller stones, and we
-   # do no need to do the nifty recursive screen updates that cgoban2 does
-   my $borderw = int ($w / ($size + 1) * 0.5);
+   my $borderw = int $w / ($size + 1) * 0.5;
    my $borderh = $borderw;
    my $w2      = $w - $borderw * 2;
    my $h2      = $h - $borderh * 2;
-   my $edge    = ceil ($w2 / ($size + 1));
+   my $edge    = ceil $w2 / ($size + 1);
    my $ofs     = $edge * 0.5;
    # we need a certain minimum size, and just fudge some formula here
    return if $w < $size * 5 + 2 + $borderw
           || $h < $size * 6 + 2 + $borderh;
       $board_img->copy_area (0, 0, $w, $h, $pixbuf, 0, 0);
    } else {
       $pixbuf = scale_pixbuf $board_img, $w, $h, 'bilinear', 0; # nearest for extra speed
    }
-   my $linew = int ($w / 40 / $size);
+   my $linew = int $w / 40 / $size;
    # ornamental border... we have time to waste :/
    pixbuf_rect $pixbuf, 0xffcc7700, 0, 0,           $w-1, $linew, 255;
    pixbuf_rect $pixbuf, 0xffcc7700, 0, 0,           $linew, $h-1, 255;
    pixbuf_rect $pixbuf, 0xffcc7700, $w-$linew-1, 0, $w-1, $h-1,   255;
       $self->{draw_stone} = sub {
          my ($x, $y) = @_;
          @area  = ($kx[$x] - $ofs, $ky[$y] - $ofs,
                       $edge + $shadow, $edge + $shadow);
-         @areai = ((ceil $area[0]), (ceil $area[1]),
+         @areai = map +(ceil $_), @area; # area, integer
-                      (int $area[2]), (int $area[3])); # area, integer
          $pb = new_pixbuf @areai[2,3];
          $self->{backgroundpb}->copy_area (@areai, $pb, 0, 0);
          $put_stack->($x-1, $y, $kx[$x-1] - $kx[$x], 0, 0, 0) if $x > 1;
    my @stack;
    my $csize = ceil $size;
    my $shadow = $size * SHADOW;
    for my $stone ($mark & MARK_W ? @white_img : @black_img) {
-      my $base = new_pixbuf +(ceil $size + $shadow) x2, 1, 0x00000000;
+      my $base = new_pixbuf +(ceil $csize + $shadow) x2, 1, 0x00000000;
       # zeroeth the shadow
       if (~$mark & MARK_GRAYED and $mark & (MARK_B | MARK_W)) {
          $shadow_img->composite (
-            $base, $shadow, $shadow, $csize, $csize, $shadow, $shadow,
+            $base,  ($shadow) x2, $csize, $csize, ($shadow) x2,
             $size / $shadow_img->get_width, $size / $shadow_img->get_height,
             'bilinear', 128
          );
       }
-      for ([MARK_B, $mark & MARK_GRAYED ?  96 : 255, 1],
+      for ([MARK_B, $mark & MARK_GRAYED ? 106 : 255, 1],
-           [MARK_W, $mark & MARK_GRAYED ? 160 : 255, TRAD_SIZE_W / TRAD_SIZE_B]) {
+           [MARK_W, $mark & MARK_GRAYED ? 190 : 255, TRAD_SIZE_W / TRAD_SIZE_B]) {
          my ($mask, $alpha, $scale) = @$_;
          if ($mark & $mask) {
             $stone->composite (
-               $base, 0, 0, $csize, $csize, ($size * (1 - $scale) * 0.5 ) x2,
+               $base, 0, 0, $csize, $csize, ($size * (1 - $scale) * 0.5) x2,
                $size * $scale / $stone->get_width, $size * $scale / $stone->get_height,
                'bilinear', $alpha
             );
          }
       }
       # then the small stones (always using the first image)
-      for ([MARK_SMALL_B, $black_img[0]],
+      for ([MARK_SMALL_B, $mark & MARK_SMALL_GRAYED ? 106 : 255, $black_img[0]],
-           [MARK_SMALL_W, $white_img[0]]) {
+           [MARK_SMALL_W, $mark & MARK_SMALL_GRAYED ? 190 : 255, $white_img[0]]) {
-         my ($mask, $img) = @$_;
+         my ($mask, $alpha, $img) = @$_;
          if ($mark & $mask) {
             $img->composite (
-               $base, (int $size / 4) x2, (ceil $size / 2 + 1) x2, ($size / 4) x2,
+               $base, ($size / 4) x2, (ceil $size / 2 + 1) x2, ($size / 4) x2,
                $size / $img->get_width / 2, $size / $img->get_height / 2,
-               'bilinear', 255
+               'bilinear', $alpha
             );
          }
       }
-      # and lastly any markers
+      # and finally any markers
       my $dark_bg = ! ! ($mark & MARK_B);
-      for ([MARK_CIRCLE,   $circle_img[$dark_bg]],
+      for ([MARK_CIRCLE,   $circle_img  [$dark_bg]],
            [MARK_TRIANGLE, $triangle_img[$dark_bg]],
+           [MARK_CROSS,    $cross_img   [$dark_bg]],
-           [MARK_SQUARE,   $square_img[$dark_bg]],
+           [MARK_SQUARE,   $square_img  [$dark_bg]],
-           [MARK_CROSS,    $cross_img[$dark_bg]],
-           [MARK_KO,       $square_img[$dark_bg]]) {
+           [MARK_KO,       $square_img  [$dark_bg]]) {
         my ($mask, $img) = @$_;
         if ($mark & $mask) {
            $img->composite (
-              $base, 0, 0, $size, $size, 0, 0,
+              $base, 0, 0, $csize, $csize, 0, 0,
               $size / $img->get_width, $size / $img->get_height,
-              'bilinear', 176
+              'bilinear', $dark_bg ? 176 : 190
            );
         }
       }
       push @stack, $base;
    my $x = int (($x - $self->{kx}[0]) * $size / ($self->{kx}[$size] - $self->{kx}[0]) + 0.5) - 1;
    my $y = int (($y - $self->{ky}[0]) * $size / ($self->{ky}[$size] - $self->{ky}[0]) + 0.5) - 1;
    my $pos = $self->{cursorpos};
-   if ($x != $pos->[0] || $y != $pos->[1]) {
+   if ((not (defined $pos) && $x >= 0 && $x < $size && $y >= 0 && $y < $size)
+       || $x != $pos->[0]
+       || $y != $pos->[1]) {
       $self->cursor (0);
       if ($x >= 0 && $x < $size
           && $y >= 0 && $y < $size) {

Diff Legend

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

Comparing Gtk2-GoBoard/GoBoard.pm (file contents): Revision 1.5 by root, Wed Jun 25 04:41:10 2008 UTC vs. Revision 1.14 by root, Tue Jul 29 10:13:05 2008 UTC

Diff Legend

Comparing Gtk2-GoBoard/GoBoard.pm (file contents):
Revision 1.5 by root, Wed Jun 25 04:41:10 2008 UTC vs.
Revision 1.14 by root, Tue Jul 29 10:13:05 2008 UTC