[ViewVC] Diff of: cvs/kgsueme/kgsueme/board.pl

Comparing kgsueme/kgsueme/board.pl (file contents):
Revision 1.2 by pcg, Mon Jun 23 01:14:21 2003 UTC vs.
Revision 1.3 by pcg, Mon Jun 23 12:47:08 2003 UTC

    }
    $self;
 }
 sub INSTANCE_INIT {
-   warn "instance_init @_\n";
    my $self = shift;
    $self->double_buffered (0);
    $self->signal_connect(configure_event => \&configure_event);
    1;
 }
 sub configure_event {
    my ($self, $event) = @_;
-   warn "configure @_\n";#d#
    delete $self->{stack};
    my $s = $self->{width} = $self->allocation->width;
-   $self->{backgroundpb} = $self->draw_board ($s);
+   $self->draw_board ($s);
-   $self->{backgroundpm} = new Gtk2::Gdk::Pixmap $self->window, $self->{width}, $self->{width}, -1;
-   $self->{backgroundpm}->draw_pixbuf ($self->style->white_gc,
-         $self->{backgroundpb},
-         0, 0, 0, 0, $self->{width}, $self->{width},
-         "normal", 0, 0);
-   $self->window->set_back_pixmap ($self->{backgroundpm}, 0);
    $self->repaint_board (delete $self->{board}, 0);
    $self->window->clear_area (0, 0, $self->{width}, $self->{width});
    1;
    }
    $$c->[$rand % @$$c];
 }
-sub pixbuf_text {
-   my ($self, $pixbuf, $colour, $x, $y, $height, $text) = @_;
-   #my $layout = $self->create_pango_layout ($text);
-   #my ($w, $h) = $layout->get_pixel_size;
-   #print "$w $h\n";#d#
-   my @c = grep $_,
-              map $::font[$colour][$::fontmap{$_}],
-                 split //, $text;
-   if (@c) {
-      my $spacing = $height * 0.1;
-      my $s = $height / List::Util::max map $_->get_height, @c;
-      my $W = List::Util::sum map $_->get_width, @c;
-      $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
-      $y -= $height * 0.5;
-      for (@c) {
-         my $w = $_->get_width * $s;
-         # +2 == don't fight the rounding
-         $_->composite ($pixbuf,
-               $x, $y, $w+2, $height+2, $x, $y, $s, $s,
-               $::config->{speed} ? 'tiles' : 'bilinear', 255);
-         $x += $w + $spacing;
-      }
-   }
-}
 sub pixbuf_rect {
    my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
    # we fake lines by... a horrible method :/
    my $colour_pb = new_pixbuf 1, 1, 0, $colour;
    $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
    my ($self, $board) = @_;
    $self->repaint_board ($board, 1);
 }
-# draw an empty board
+sub center_text {
+   my ($self, $drawable, $colour, $x, $y, $size, $text) = @_;
+   my $context = $self->get_pango_context;
+   my $font = $context->get_font_description;
+   $font->set_size ($size * Gtk2::Pango->scale);
+   my $layout = new Gtk2::Pango::Layout $context;
+   $layout->set_text ($text);
+   my ($w, $h) = $layout->get_pixel_size;
+   #d# does not work
+   my $gc = $self->style->black_gc;
+   $gc->set_foreground (new Gtk2::Gdk::Color +($colour > 24) & 255, +($colour > 16) & 255, +($colour > 8) & 255);
+   $drawable->draw_layout ($gc,
+                           $x - $w*0.5, $y - $h*0.5, $layout);
+}
+# draw an empty board and attach the bg pixmap
 sub draw_board {
    my ($self, $s) = @_;
    my $canvas = $self->{canvas};
    my $size = $self->{size};
+   my $pixmap = new Gtk2::Gdk::Pixmap $self->window, $self->{width}, $self->{width}, -1;
    # we leave enough space for the shadows.. I like smaller stones, and we
    # do no need to do the nifty recursive screen updates that goban2 does
    my $border = int ($s / ($size + 3) * 0.5);
    my $s2     = $s - $border * 2;
    pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1,   255;
    for my $i (1 .. $size) {
       pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
       pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
-      # 38 max, but we allow a bit more
-      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
-                        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];
-      pixbuf_text $self, $pixbuf, 0, $k[$i], $border,       $ofs, $label;
-      pixbuf_text $self, $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
-      pixbuf_text $self, $pixbuf, 0, $border, $k[$i],       $ofs, $size - $i + 1;
-      pixbuf_text $self, $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
-      $a++;
-      $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
    }
    # hoshi points
    my $hoshi = sub {
       my ($x, $y) = @_;
       }
       # the tengen
       $hoshi->($h2, $h2);
    }
-   $pixbuf;
+   # now we have a board sans text
+   $pixmap->draw_pixbuf ($self->style->white_gc,
+         $pixbuf,
+         0, 0, 0, 0, $self->{width}, $self->{width},
+         "normal", 0, 0);
+   # now draw the labels
+   for my $i (1 .. $size) {
+      # 38 max, but we allow a bit more
+      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
+                        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];
+      $self->center_text ($pixmap, 0, $k[$i], $border,       $ofs, $label);
+      $self->center_text ($pixmap, 0, $k[$i], $s2 + $border, $ofs, $label);
+      $self->center_text ($pixmap, 0, $border, $k[$i],       $ofs, $size - $i + 1);
+      $self->center_text ($pixmap, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1);
+      $a++;
+      $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
+   }
+   $self->window->set_back_pixmap ($pixmap, 0);
+   $self->{backgroundpm} = $pixmap;
+   $self->{backgroundpb} = $pixbuf;
 }
 sub repaint_board {
    my ($self, $board, $dopaint) = @_;
                         $edge + $shadow, $edge + $shadow);
             my $pb = new_pixbuf @area[2,3];
             $self->{backgroundpb}->copy_area (@area, $pb, 0, 0);
-            if ($mark) {
+            if ($mark & ~MARK_LABEL) {
                my $stack = $self->create_stack($mark, $edge, $rand);
                $stack->composite ($pb, 0, 0, @area[2,3], 0, 0, 1, 1,
                                   'nearest', 255);
-               # labels are handled here because they are quite rare
-               if ($mark & MARK_LABEL) {
-                  my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
-                  if ($white) {
-                     pixbuf_text $pb, 0,
-                                 $ofs * 0.1, $ofs * 0.1, $ofs * 0.7,
-                                 $self->{board}{label}[$x-1][$y-1];
-                  }
-                  pixbuf_text $pb, $white,
-                              0, 0, $ofs * 0.7,
-                              $self->{board}{label}[$x-1][$y-1];
-               }
             }
             # speed none, normal, max
             $self->{backgroundpm}->draw_pixbuf ($self->style->black_gc, $pb,
                                      0, 0, @area, 'max', 0, 0);
+            # labels are handled here because they are quite rare
+            if ($mark & MARK_LABEL) {
+               my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 0xffffff00;
+               if ($white) {
+                  $self->center_text ($self->{backgroundpm}, 0,
+                                      $area[0] + $ofs * 1.1, $area[1] + $ofs * 1.1,
+                                      $ofs * 0.7, $self->{board}{label}[$x-1][$y-1]);
+               }
+               $self->center_text ($self->{backgroundpm}, $white,
+                                   $area[0] + $ofs, $area[1] + $ofs,
+                                   $ofs * 0.7, $self->{board}{label}[$x-1][$y-1]);
+            }
             # a single full clear_area is way faster than many single calls here
             push @areas, \@area if $dopaint;
          }
       }
    }
    $self->{board} = $board;
    #d# save
    #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
 }
-sub redraw {
-   my ($self, $area) = @_;
-   if ($area && $self->{pixbuf}) {
-      my ($x, $y, $w, $h) = $area->values;
-      $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
-            $x, $y, $x, $y, $w, $h,
-            "normal", 0, 0);
-      $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
-                         $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
-   }
-}
 sub FINALIZE {
    warn "FINALIZE(@_)\n";#d#
    my ($self) = @_;
    $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
       for BLACK, WHITE;

Diff Legend

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

Comparing kgsueme/kgsueme/board.pl (file contents): Revision 1.2 by pcg, Mon Jun 23 01:14:21 2003 UTC vs. Revision 1.3 by pcg, Mon Jun 23 12:47:08 2003 UTC

Diff Legend

Comparing kgsueme/kgsueme/board.pl (file contents):
Revision 1.2 by pcg, Mon Jun 23 01:14:21 2003 UTC vs.
Revision 1.3 by pcg, Mon Jun 23 12:47:08 2003 UTC