--- kgsueme/bin/kgsueme	2003/05/30 11:53:24	1.23
+++ kgsueme/bin/kgsueme	2003/05/31 03:11:58	1.26
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I../lib/
+#!/usr/bin/perl
 
 use Gtk;
 use Gtk::Gdk;
@@ -12,12 +12,19 @@
 use Audio::Play;
 
 use IO::Socket::INET;
-
+use List::Util;
 use Errno;
 
 init Gtk;
 
-$HACK = 1; # do NEVER enable. ;)
+our $HACK = 1; # do NEVER enable. ;)
+our $DEBUG_EXPOSE = 1;
+
+if ($HACK) {
+   $KGS::debug = 1;
+}
+
+our $VERSION = "0.1";
 
 our $config;
 our $LIBDIR = ".";
@@ -83,7 +90,7 @@
 
    $config = $state->{config} ||= {};
 
-   $config{speed} = 1;#d# optimize for speed or memory?
+   $config{speed} = 0;#d# optimize for speed or memory?
    $config{conserve_memory} = 0;
 
    # grr... more gtk+ brokenness
@@ -184,12 +191,21 @@
 if (0) {
    use KGS::Constants;
 
-   my $board = new game size => 5;
-   $board->{board} = new KGS::Game::Board;
-   $board->{board}{board}[0][0] = MARK_B;
-   $board->{board}{board}[1][1] = MARK_GRAY_B | MARK_SMALL_W;
-   $board->{board}{board}[2][2] = MARK_W | MARK_TRIANGLE;
-   $board->{window}->show_all;
+   for (19) {
+      my $board = new game %{Storable::retrieve "testboard.storable"};
+
+      if (0) {
+         $board->{board} = new KGS::Game::Board;
+         $board->{board}{board}[0][0] = MARK_B;
+         $board->{board}{board}[1][1] = MARK_GRAY_B | MARK_SMALL_W;
+         $board->{board}{board}[2][2] = MARK_W | MARK_TRIANGLE;
+         $board->{board}{board}[1][2] = MARK_B | MARK_LABEL;
+         $board->{board}{label}[1][2] = "198";
+         $board->{board}{board}[0][2] = MARK_W | MARK_LABEL;
+         $board->{board}{label}[0][2] = "AWA";
+      }
+      $board->{window}->show_all;
+   }
 }
 
 main Gtk;
@@ -208,7 +224,7 @@
 
    KGS::Listener::Debug->new->listen($self->{conn}); #d# debug only :)
 
-   $self->listen($self->{conn});
+   $self->listen($self->{conn}, "login");
 
    $self->{roomlist} = new roomlist conn => $self->{conn};
 
@@ -281,7 +297,7 @@
    };
 
    # now login
-   $self->{conn}->login($self->{login}->get_text, $self->{password}->get_text);
+   $self->{conn}->login("kgsueme $VERSION $^O", $self->{login}->get_text, $self->{password}->get_text);
 }
 
 sub inject_login {
@@ -385,7 +401,7 @@
    my $self = shift;
    $self = $self->SUPER::new(@_);
 
-   $self->listen($self->{conn});
+   $self->listen($self->{conn}, qw(msg_room:));
 
    $self->{window} = new Gtk::Window 'toplevel';
    $self->{window}->set_title("KGS Room $self->{name}");
@@ -438,6 +454,29 @@
    $self;
 }
 
+sub join {
+   my ($self) = @_;
+   $self->SUPER::join;
+
+   $self->{window}->show_all;
+}
+
+sub part {
+   my ($self) = @_;
+   $self->SUPER::part;
+
+   delete $::config->{rooms}{$self->{channel}};
+   $self->{window}->hide_all;
+   $self->event_update_users;
+   $self->event_update_games;
+}
+
+sub inject_msg_room {
+   my ($self, $msg) = @_;
+
+   $self->{text}->insert(undef, undef, undef, "\n$msg->{name}: $msg->{message}");
+}
+
 sub event_update_users {
    my ($self) = @_;
 
@@ -486,23 +525,6 @@
    });
 }
 
-sub join {
-   my ($self) = @_;
-   $self->SUPER::join;
-
-   $self->{window}->show_all;
-}
-
-sub part {
-   my ($self) = @_;
-   $self->SUPER::part;
-
-   delete $::config->{rooms}{$self->{channel}};
-   $self->{window}->hide_all;
-   $self->event_update_users;
-   $self->event_update_games;
-}
-
 sub event_join {
    my ($self) = @_;
    $self->SUPER::event_join;
@@ -516,13 +538,6 @@
    $self->{text}->insert(undef, undef, undef, "\n$self->{owner}: $self->{description}\n");
 }
 
-sub inject_msg_room {
-   my ($self, $msg) = @_;
-   return unless $self->{channel} == $msg->{channel};
-
-   $self->{text}->insert(undef, undef, undef, "\n$msg->{name}: $msg->{message}");
-}
-
 #############################################################################
 
 package game;
@@ -540,7 +555,8 @@
    $self->listen($self->{conn});
 
    $self->{window} = new Gtk::Window 'toplevel';
-   $self->{window}->set_title("KGS Game ".$self->user0." ".$self->user1) if $self->{channel};#d#
+   my $title = $self->{channel} ? $self->user0." ".$self->user1 : "Game Window";
+   $self->{window}->set_title("KGS Game $title");
    ::state $self->{window}, "game::window", undef, window_size => [600, 500];
 
    $self->{window}->signal_connect(delete_event => sub { $self->part; 1 });
@@ -548,9 +564,39 @@
    $self->{window}->add(my $hpane = new Gtk::HPaned);
    ::state $hpane, "game::hpane", undef, hpane_position => 500;
 
+   $hpane->pack1(my $vbox = new Gtk::VBox);
+
+   $vbox->pack_start((my $frame = new Gtk::Frame), 0, 1, 0);
+
+   {
+      $frame->add(my $vbox = new Gtk::VBox);
+      $vbox->add($self->{title} = new Gtk::Label $title);
+
+      $self->{moveadj} = new Gtk::Adjustment 0, 0, 0, 1, 10, 0;
+      $vbox->add(my $scale = new Gtk::HScale $self->{moveadj});
+      $scale->set_draw_value (1);
+      $scale->set_digits (0);
+      $scale->set_value_pos('top');
+
+      $self->{moveadj}->signal_connect (value_changed => sub {
+         $self->{board} = new KGS::Game::Board $self->{size};
+         $self->{board}->interpret_path ([@{$self->{path}}[0 .. $self->{moveadj}->value - 1]]);
+
+         my $area = $self->repaint_board;
+
+         # force a redraw (not perfect(?))
+         $self->expose ($area);
+
+         $self->{text}->backward_delete($self->{text}->get_length);
+         $self->{text}->insert(undef, undef, undef, KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
+      });
+
+      $self->{moveadj}->upper (scalar @{$self->{path}}) if $self->{path};
+   }
+   
    Gtk::Widget->push_visual (Gtk::Gdk::Rgb->get_visual);
    Gtk::Widget->push_colormap (Gtk::Gdk::Rgb->get_cmap);
-   $hpane->pack1(($self->{canvas} = new Gtk::DrawingArea), 1, 1);
+   $vbox->pack_start(($self->{canvas} = new Gtk::DrawingArea), 1, 1, 0);
    Gtk::Widget->pop_colormap;
    Gtk::Widget->pop_visual;
 
@@ -607,6 +653,8 @@
 sub configure_event {
    my ($widget, $self, $event) = @_;
    delete $self->{stack};
+   delete $self->{pixbuf};
+   delete $self->{board_shown};
    delete $self->{background};
    $self->repaint_board;
    1;
@@ -648,7 +696,7 @@
 sub create_stack {
    my ($self, $mark, $size, $rand) = @_;
 
-   my $shadow = $size * 0.06;
+   my $shadow = $size * 0.05;
 
    my $c = \$self->{stack}{$mark};
    unless ($$c) {
@@ -656,11 +704,13 @@
          my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 1;
 
          # zeroeth the shadow
-         $::black_img[0]->composite (
-            $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5,
-            $size / $stone->get_width, $size / $stone->get_height,
-            $::config{speed} ? INTERP_NEAREST : INTERP_TILES, 128
-         );
+         if ($mark & (MARK_B | MARK_W)) {
+            $::black_img[0]->composite (
+               $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5,
+               $size / $stone->get_width, $size / $stone->get_height,
+               $::config{speed} ? INTERP_NEAREST : INTERP_TILES, 128
+            );
+         }
 
          # first the big stones
          for ([MARK_B,      255],
@@ -690,7 +740,7 @@
             }
          }
 
-         # and lastly any markers (labels NYI)
+         # and lastly any markers
          my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
 
          for ([MARK_CIRCLE,   $::circle_img[$dark_bg]],
@@ -716,21 +766,26 @@
 sub pixbuf_text {
    my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
 
-   my $c = $::font[$colour][$::fontmap{substr $text, 0, 1}];
-
-   if ($c) {
-      my ($w, $h) = ($c->get_width, $c->get_height);
-      my $s = ($height-1) / ($h-1);
+   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 * 0.5;
+      $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
       $y -= $height * 0.5;
 
-      $c->composite ($pixbuf,
-            $x, $y, $w*$s+0.5, $height+0.5, $x-0.5, $y-0.5, $s, $s,
-            $::config{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192);
+      for (@c) {
+         my $w = $_->get_width * $s;
+         $_->composite ($pixbuf,
+               $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s,
+               $::config{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
 
-   } else {
-      warn "unable to render character '$text'";
+         $x += $w + $spacing;
+      }
    }
 }
 
@@ -750,8 +805,9 @@
 sub repaint_board {
    my ($self) = @_;
    my $canvas = $self->{canvas};
+   my $expose_area = undef;
 
-   return unless $self->{board};
+   return $expose_area unless $self->{board};
 
    my ($w, $h) = @{$canvas->allocation}[2,3];
    
@@ -761,18 +817,27 @@
 
    my $size = $self->{size};
 
-   my $border = int ($s / $size);
+   my $border = int ($s / ($size + 3) * 0.5);
    my $s2     = $s - $border * 2;
-   my $edge   = int ($s2 / $size * 0.97);
+   my $edge   = int ($s2 / ($size + 1) * 0.95);
    my $ofs    = int ($edge / 2);
 
-   my @k = map int ($s2 * $_ / $size - $ofs + $border + 0.5), 0 .. $size;
+   my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
 
    my $pixbuf;
 
+   my $oldboard;
+
    if ($self->{background}) {
-      $pixbuf = $self->{background}->copy;
+      if ($oldboard = $self->{board_shown}) {
+         $pixbuf = $self->{pixbuf};
+      } else {
+         $pixbuf = $self->{background}->copy;
+         $expose_area = [0, 0, $s, $s];
+      }
    } else {
+      $expose_area = [0, 0, $s, $s];
+
       my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
 
       if ($s < $bw && $s < $bh) {
@@ -782,17 +847,20 @@
          $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config{speed} ? INTERP_NEAREST : INTERP_TILES;
       }
 
-      my $linew = int ($s / 500);
+      my $linew = int ($s / 25 / $size);
 
-      my $a = "A";
       for my $i (1 .. $size) {
          pixbuf_rect $pixbuf, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew;
          pixbuf_rect $pixbuf, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew;
 
-         pixbuf_text $pixbuf, 0, $k[$i], ($ofs +$border) / 2,      $ofs, $a;
-         pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border + $ofs / 2, $ofs, $a;
-         pixbuf_text $pixbuf, 0, ($ofs + $border) / 2, $k[$i],     $ofs, $size - $i + 1;
-         pixbuf_text $pixbuf, 0, $s2 + $border + $ofs / 2, $k[$i], $ofs, $size - $i + 1;
+         # 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 $pixbuf, 0, $k[$i], $border,       $ofs, $label;
+         pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
+         pixbuf_text $pixbuf, 0, $border, $k[$i],       $ofs, $size - $i + 1;
+         pixbuf_text $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...
@@ -811,15 +879,40 @@
 
    for my $x (1 .. $size) {
       for my $y (1 .. $size) {
+         my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
          my $mark = $self->{board}{board}[$x-1][$y-1];
+         my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
+
+         if ($oldboard && $old != $mark) {
+            my $shadow = $edge * 0.05;
+            my $new_expose =  [$dx, $dy, $edge + $shadow, $edge + $shadow];
+            $self->{background}->copy_area (@$new_expose, $pixbuf, $dx, $dy);
+            $expose_area = $expose_area
+                              ? Gtk::Gdk::Rectangle->union ($expose_area, $new_expose)
+                              : $new_expose;
+         }
 
          if ($mark) {
-            my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
             my $pb = $self->create_stack($mark, $edge, $x * 17 + $y * 11 );
 
             $pb->composite ($pixbuf, $dx, $dy, $pb->get_width, $pb->get_height,
                             $dx, $dy, 1, 1, $::config{speed} ? INTERP_NEAREST : INTERP_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 $pixbuf, 0,
+                              $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
+                              $self->{board}{label}[$x-1][$y-1];
+               }
+               pixbuf_text $pixbuf, $white,
+                           $k[$x], $k[$y], $ofs * 0.7,
+                           $self->{board}{label}[$x-1][$y-1];
+            }
             
+            # old pixmap&mask-way. that was fast ;(
             #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
 
             #$gc->set_clip_mask ($bm);
@@ -828,46 +921,62 @@
          }
       }
    }
-}
 
-sub expose_event {
-   my ($widget, $self, $event) = @_;
+   $self->{board_shown} = Storable::dclone $self->{board};
+   #d# save
+   #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
 
-   $self->{pixbuf} or return;
+   $expose_area;
+}
 
-   my ($ox, $oy, $s) = @{$self->{offsets}};
+sub expose {
+   my ($self, $area) = @_;
 
-   my ($x, $y, $w, $h) =
-      @{Gtk::Gdk::Rectangle->intersect(
-          $event->{area},
-          [$ox, $oy, $s, $s]
-      )};
+   if ($area && $self->{pixbuf}) {
+      my ($x, $y, $w, $h) = @$area;
+      my ($ox, $oy, $s) = @{$self->{offsets}};
 
-   if (defined $x) {
       $self->{pixbuf}->render_to_drawable ($self->{canvas}->window, $self->{canvas}->style->white_gc,
-            $x - $ox, $y - $oy, $x, $y, $w, $h);
+            $x, $y, $x + $ox, $y + $oy, $w, $h);
+      $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
+                         $x + $ox, $y + $oy, $w, $h) if $::DEBUG_EXPOSE;
+
       #$self->{canvas}->window->draw_pixmap (
       #   $self->{canvas}->style->white_gc,
       #   $self->{pixmap},
       #   $x - $ox, $y - $oy, $x, $y, $w, $h,
       #);
    }
+}
+
+sub expose_event {
+   my ($widget, $self, $event) = @_;
+
+   $self->{pixbuf} or return;
+
+   my $area = $event->{area};
+   my ($ox, $oy, $s) = @{$self->{offsets}};
+
+   $self->expose (Gtk::Gdk::Rectangle->intersect (
+             [$area->[0] - $ox, $area->[1] - $oy, $area->[2], $area->[3]],
+             [0, 0, $s, $s],
+          ));
+
    1;
 }
 
 sub event_update_tree {
    my ($self) = @_;
 
-   $self->{board} = new KGS::Game::Board $self->{size};
-   $self->{board}->interpret_path ($self->get_path);
-
-   $self->repaint_board;
+   $self->{path} = $self->get_path;
+   
+   my $move = @{$self->{path}};
 
-   # force a redraw (not perfect(?))
-   expose_event $self->{canvas}, $self, { area => $self->{canvas}->allocation };
+   $self->{moveadj}->upper($move);
 
-   $self->{text}->backward_delete($self->{text}->get_length);
-   $self->{text}->insert(undef, undef, undef, KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
+   if ($self->{moveadj}->value >= $move - 1 || !$self->{moveadj}->value) {
+      $self->{moveadj}->set_value ($move);
+   }
 }
 
 sub event_move {