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

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.8 by pcg, Sat May 31 15:19:55 2003 UTC vs.
Revision 1.19 by pcg, Sun Jun 1 05:18:15 2003 UTC

 use base KGS::Listener::Game;
 use base KGS::Game;
 use base gtk::widget;
+use POSIX qw(ceil);
 sub new {
    my $self = shift;
    $self = $self->SUPER::new(@_);
    {
       # grrr...
       $frame->add(my $vbox = new Gtk2::VBox);
       $vbox->add($self->{title} = new Gtk2::Label $title);
-      $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.01, 0.1, 0;
+      $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.001, 0.05, 0;
       $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
       $scale->set_draw_value (0);
       $self->{moveadj}->signal_connect (value_changed => sub {
          return unless $self->{path};
          my $move = int (@{$self->{path}} * $_[0]->get_value);
+         $self->{board_label}->set_text ("Move $move");
          $self->{board} = new KGS::Game::Board $self->{size};
          $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
          $self->redraw ($self->repaint_board);
          $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
       });
    }
-   $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0);
+   #d#TYPOE
+   $vbox->pack_start((my $aspect_frame = gtk_aspect_frame_new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
+   $aspect_frame->set (border_width => 0);
+   $aspect_frame->set (shadow_type => 'none');
+   $self->{board_label} = $aspect_frame->get_label_widget;
+   $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
+   $self->{canvas}->double_buffered (0);
    $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
    $self->{canvas}->signal_connect(expose_event    => \&expose_event,    $self);
    $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0);
    gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
    $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
    $sw->set_policy("automatic", "always");
-   $sw->add(($self->{userlist} = new gtk::userlist)->widget);
+   $sw->add(($self->{userlist} = new userlist)->widget);
    $self->{vpane}->add(my $vbox = new Gtk2::VBox);
    $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
    $sw->set_policy("never", "always");
    $sw->add(($self->{text} = new gtk::text)->widget);
    $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
    $self->{entry}->signal_connect(activate => sub {
       my $text = $self->{entry}->get_text;
-      # add message
+      $self->say($text) if $text =~ /\S/;
       $self->{entry}->set_text("");
    });
    $self;
 }
 sub event_update_users {
-   my ($self) = @_;
+   my ($self, $add, $update, $remove) = @_;
-   $self->{userlist}->update($self->{users});
+   $self->{userlist}->update ($add, $update, $remove);
 }
 sub join {
    my ($self) = @_;
    $self->SUPER::join;
    my ($widget, $event, $self) = @_;
    $self->{pixbuf} or return;
    my $area = $event->area;
-   my ($ox, $oy, $s) = @{$self->{offsets}};
-   $self->redraw (
+   $self->redraw ($area);
-             (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height)
-                ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s)
-          );
    0;
 }
 # something Gtk2 fixed
       for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
          my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
          # zeroeth the shadow
          if ($mark & (MARK_B | MARK_W)) {
-            $::black_img[0]->composite (
+            $::shadow_img->composite (
-               $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5,
+               $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
                $size / $stone->get_width, $size / $stone->get_height,
-               $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 128
+               $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
             );
          }
          # first the big stones (handicap stones different for effect)
          for ([MARK_B,      $mark & MARK_MOVE ? 255 : 192],
               [MARK_GRAY_B, 128],
               [MARK_GRAY_W, 128]) {
             my ($mask, $alpha) = @$_;
             if ($mark & $mask) {
                $stone->composite (
-                  $base, 0, 0, $size, $size, -0.5, -0.5,
+                  $base, 0, 0, $size, $size, 0, 0,
                   $size / $stone->get_width, $size / $stone->get_height,
                   $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
                );
             }
          }
-         # then the samll stones
+         # then the small stones
          for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
               [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
             my ($mask, $img) = @$_;
             if ($mark & $mask) {
                $img->composite (
-                  $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2,
+                  $base, (ceil ($size / 4)) x2, (ceil ($size / 2)) x2, (ceil ($size / 4)) x2,
                   $size / $img->get_width / 2, $size / $img->get_height / 2,
-                  $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
+                  $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
                );
             }
          }
          # and lastly any markers
       $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+1, $height+1, $x, $y, $s, $s,
+               $x, $y, $w+2, $height+2, $x, $y, $s, $s,
                $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
          $x += $w + $spacing;
       }
    }
    my $expose_area = undef;
    return $expose_area unless $self->{board};
    my ($w, $h) = ($canvas->allocation->values)[2,3];
+   die "FATAL: board aspect ratio != 1" unless $w == $h;
-   my $s = $w > $h ? $h : $w;
+   my $s = $w;
-   return unless $s > 128;
+   return unless $s >= 200;
-   $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
    my $size = $self->{size};
+   # 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;
-   my $edge   = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0);
+   my $edge   = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
    my $ofs    = int ($edge / 2);
    my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
    my $pixbuf;
 sub redraw {
    my ($self, $area) = @_;
    if ($area && $self->{pixbuf}) {
       my ($x, $y, $w, $h) = $area->values;
-      my ($ox, $oy, $s) = @{$self->{offsets}};
       $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
-            $x, $y, $x + $ox, $y + $oy, $w, $h,
+            $x, $y, $x, $y, $w, $h,
             "normal", 0, 0);
       $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
-                         $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
+                         $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
    }
 }
 sub event_update_tree {
    my ($self) = @_;

Diff Legend

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

Comparing kgsueme/kgsueme/game.pl (file contents): Revision 1.8 by pcg, Sat May 31 15:19:55 2003 UTC vs. Revision 1.19 by pcg, Sun Jun 1 05:18:15 2003 UTC

Diff Legend

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.8 by pcg, Sat May 31 15:19:55 2003 UTC vs.
Revision 1.19 by pcg, Sun Jun 1 05:18:15 2003 UTC