--- kgsueme/bin/kgsueme 2003/05/29 01:13:32 1.5 +++ kgsueme/bin/kgsueme 2003/05/30 11:25:02 1.20 @@ -1,13 +1,16 @@ -#!/opt/bin/perl - -use PApp::Util qw(dumpval); # debug only +#!/usr/bin/perl -I../lib/ use Gtk; use Gtk::Gdk; +use Gtk::Gdk::Pixbuf; +#use Gtk::Gdk::ImlibImage; use KGS::Protocol; use KGS::Listener::Debug; +use Audio::Data; +use Audio::Play; + use IO::Socket::INET; use Errno; @@ -17,6 +20,57 @@ $HACK = 1; # do NEVER enable. ;) our $config; +our $LIBDIR = "."; +our $IMGDIR = "$LIBDIR/images"; +our $SNDDIR = "$LIBDIR/sounds"; + +sub load_img { + new_from_file Gtk::Gdk::Pixbuf "$IMGDIR/$_[0]" +# load_image Gtk::Gdk::ImlibImage "$IMGDIR/$_[0]" + or die "$IMGDIR/$_[0]: $!"; +} + +my @fontchars = ('A' .. 'Z', 0 .. 9); + +our @black_img = load_img "b-01.png"; +our @white_img = map +(load_img "w-0$_.png"), 1,2,3,4,5; +our @triangle_img = map +(load_img "triangle-$_.png"), qw(b w); +our @square_img = map +(load_img "square-$_.png"), qw(b w); +our @circle_img = map +(load_img "circle-$_.png"), qw(b w); +our $board_img = load_img "woodgrain-01.jpg"; + +our @font = ( + [map +(load_img "font/$_-black.png"), @fontchars], + [map +(load_img "font/$_-white.png"), @fontchars], + ); +our %fontmap; +@fontmap{@fontchars} = (0..25 + 10); +@fontmap{'a' .. 'z'} = (0..25); + +{ + #my $audioserver = new Audio::Play(0); + my %sound; + $SIG{CHLD} = 'IGNORE'; + + for (qw(alarm warning move)) { + local $/; + open my $snd, "<", "$SNDDIR/$_" + or die "$SNDDIR: $!"; + binmode $snd; + + $sound{$_} = new Audio::Data; + $sound{$_}->Load($snd); + } + + sub play_sound { + if (fork == 0) { + if (my $audioserver = new Audio::Play(1)) { + $audioserver->play ($sound{$_[0]}); + } + Gtk->_exit(0); + } + } +} { use Storable (); @@ -34,7 +88,7 @@ hpane_position => sub { ($_[0]->children)[0]->allocation->[2] }, vpane_position => sub { ($_[0]->children)[0]->allocation->[3] }, window_size => sub { [ @{$_[0]->allocation}[2,3] ] }, - #window_pos => sub { die PApp::Util::dumpval [ $_[0]->get_root_origin ] }, + #window_pos => sub { die KGS::Listener::Debug::dumpval [ $_[0]->get_root_origin ] }, clist_column_widths => sub { $_[0]{column_widths}; }, @@ -73,6 +127,9 @@ for (@widgets) { if ($_->[0]) { my ($widget, $class, $instance, $attr) = @$_; + + $widget->realize; + while (my ($k, $v) = each %$attr) { my ($set, $get) = $k =~ /=/ ? split /=/, $k : ($k, $k); $v = $get{$get} ? $get{$get}->($widget) : $widget->get($get); @@ -121,6 +178,17 @@ } } +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; +} + main Gtk; ############################################################################# @@ -144,7 +212,7 @@ $self->{window} = new Gtk::Window 'toplevel'; $self->{window}->set_title('kgsueme'); ::state $self->{window}, "main::window", undef, window_size => [400, 100]; - $self->{window}->signal_connect(delete_event => sub { main_quit Gtk }); + $self->{window}->signal_connect(delete_event => sub { main_quit Gtk; 1 }); $self->{window}->add(my $vbox = new Gtk::VBox); @@ -220,14 +288,10 @@ $::config->{login} = $self->{conn}{name}; if ($msg->{success}) { - warn "hiya\n"; for (keys %{$::config->{rooms}}) { - warn "hiya $_\n"; $self->{roomlist}->join_room($_); } } - - warn PApp::Util::dumpval($::config); } sub event_disconnect { } @@ -248,7 +312,7 @@ $self->{window}->set_title('KGS Rooms'); ::state $self->{window}, "roomlist::window", undef, window_size => [400, 200]; - $self->{window}->signal_connect(delete_event => sub { $self->{window}->hide }); + $self->{window}->signal_connect(delete_event => sub { $self->{window}->hide; 1 }); $self->{window}->add(my $vbox = new Gtk::VBox); @@ -284,7 +348,7 @@ $self->{window}->show_all; } -sub event_update { +sub event_update_rooms { my ($self) = @_; $self->{event_update} ||= Gtk->timeout_add(200, sub { @@ -324,7 +388,7 @@ $self->{window}->set_title("KGS Room $self->{name}"); ::state $self->{window}, "room::window", $self->{name}, window_size => [600, 400]; - $self->{window}->signal_connect(delete_event => sub { $self->part }); + $self->{window}->signal_connect(delete_event => sub { $self->part; 1 }); $self->{window}->add(my $hpane = new Gtk::HPaned); ::state $hpane, "room::hpane", $self->{name}, hpane_position => 200; @@ -371,7 +435,7 @@ $self; } -sub event_update { +sub event_update_users { my ($self) = @_; $self->{event_update} ||= Gtk->timeout_add(200, sub { @@ -432,7 +496,7 @@ delete $::config->{rooms}{$self->{channel}}; $self->{window}->hide_all; - $self->event_update; + $self->event_update_users; $self->event_update_games; } @@ -446,20 +510,23 @@ sub event_update_roominfo { my ($self) = @_; - $self->{text}->insert(undef, undef, undef, "$self->{owner}: $self->{description}\n\n"); + $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, "$msg->{name}: $msg->{message}\n"); + $self->{text}->insert(undef, undef, undef, "\n$msg->{name}: $msg->{message}"); } ############################################################################# package game; +use KGS::Constants; +use KGS::Game::Board; + use base KGS::Listener::Game; use base KGS::Game; @@ -470,25 +537,24 @@ $self->listen($self->{conn}); $self->{window} = new Gtk::Window 'toplevel'; - $self->{window}->set_title("KGS Game ".$self->user0." ".$self->user1); + $self->{window}->set_title("KGS Game ".$self->user0." ".$self->user1) if $self->{channel};#d# ::state $self->{window}, "game::window", undef, window_size => [600, 500]; - $self->{window}->signal_connect(delete_event => sub { $self->part }); + $self->{window}->signal_connect(delete_event => sub { $self->part; 1 }); $self->{window}->add(my $hpane = new Gtk::HPaned); ::state $hpane, "game::hpane", undef, hpane_position => 500; - $hpane->add(my $board = new Gtk::Table $self->{size}, $self->{size}, 1); + 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); + Gtk::Widget->pop_colormap; + Gtk::Widget->pop_visual; - for my $x (0 .. $self->{size} - 1) { - for my $y (0 .. $self->{size} - 1) { - my $cell = new Gtk::Label; - $board->attach_defaults($cell, $x, $x + 1, $y, $y + 1); - $self->{board}[$x][$y] = $cell; - } - } + $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); + $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); - $hpane->add(my $vpane = new Gtk::VPaned); + $hpane->pack2((my $vpane = new Gtk::VPaned), 0, 0); ::state $vpane, "game", $self->{name}, vpane_position => 80; $vpane->add(my $sw = new Gtk::ScrolledWindow); @@ -515,28 +581,10 @@ $self; } -sub event_update { +sub event_update_users { my ($self) = @_; - $self->{event_update} ||= Gtk->timeout_add(200, sub { - my $l = $self->{userlist}; - - $l->freeze; - my $pos = $l->get_vadjustment->get_value; - $l->clear; - - my $row = 0; - for (values %{$self->{users}}) { - $l->append($_->{name}); - $l->set_row_data($row++, $_); - } - $l->sort; - $l->get_vadjustment->set_value($pos); - $l->thaw; - - delete $self->{event_update}; - 0; - }); + room::event_update_users $self; } sub join { @@ -550,33 +598,273 @@ my ($self) = @_; $self->SUPER::part; - $self->{window}->hide_all; - $self->event_update; + $self->{window}->hide; } -sub event_update_tree { +sub configure_event { + my ($widget, $self, $event) = @_; + delete $self->{stack}; + delete $self->{background}; + $self->repaint_board; + 1; +} + +sub INTERP_NEAREST (){ 1 } +sub INTERP_TILES (){ 1 } +sub INTERP_BILINEAR (){ 2 } +sub INTERP_HYPER (){ 3 } + +sub new_pixbuf { + my ($w, $h, $alpha, $clear) = @_; + + my $pixbuf = new Gtk::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h; + + if ($clear) { # damn, need to clear it ourselves + my $row = "\x00\x00\x00\x00" x $w; + $pixbuf->put_pixels ($row, $_, 0) for 0 .. $h - 1; + } + + $pixbuf; +} + +sub scale_pixbuf { + my ($src, $w, $h, $mode) = @_; + + my $dst = new_pixbuf $w, $h, 1; + + $src->scale( + $dst, 0, 0, $w, $h, 0, 0, + $w / $src->get_width, $h / $src->get_height, + $mode, + ); + + $dst; +} + +# create a stack of stones +sub create_stack { + my ($self, $mark, $size, $rand) = @_; + + my $shadow = $size * 0.06; + + my $c = \$self->{stack}{$mark}; + unless ($$c) { + for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { + 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, + INTERP_TILES, 128 + ); + + # first the big stones + for ([MARK_B, 255], + [MARK_W, 255], + [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, + $size / $stone->get_width, $size / $stone->get_height, + INTERP_HYPER, $alpha + ); + } + } + + # then the samll 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, + $size / $img->get_width / 2, $size / $img->get_height / 2, + INTERP_HYPER, 192 + ); + } + } + + # and lastly any markers (labels NYI) + my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B)); + + for ([MARK_CIRCLE, $::circle_img[$dark_bg]], + [MARK_TRIANGLE, $::triangle_img[$dark_bg]], + [MARK_SQUARE, $::square_img[$dark_bg]]) { + my ($mask, $img) = @$_; + if ($mark & $mask) { + $img->composite ( + $base, 0, 0, $size, $size, -0.5, -0.5, + $size / $img->get_width, $size / $img->get_height, + INTERP_HYPER, 255 + ); + } + } + + push @$$c, $base; + } + } + + $$c->[$rand % @$$c]; +} + +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); + + $x -= $w * $s * 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, + INTERP_BILINEAR, 192); + + } else { + warn "unable to render character '$text'"; + } +} + +my $black_pb; + +sub pixbuf_rect { + my ($pb, $x1, $y1, $x2, $y2) = @_; + # we fake lines by... an unspeakable method :/ + unless ($black_pb) { + $black_pb = new_pixbuf 1, 1, 0, 0; + $black_pb->put_pixels ("\x44\x11\x11", 0, 0); + } + + $black_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, 1, 1, INTERP_NEAREST, 192); +} + +sub repaint_board { my ($self) = @_; + my $canvas = $self->{canvas}; + + return unless $self->{board}; + + my ($w, $h) = @{$canvas->allocation}[2,3]; + + my $s = $w > $h ? $h : $w; + + $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s]; - for my $x (0 .. $self->{size} - 1) { - for my $y (0 .. $self->{size} - 1) { - $self->{board}[$x][$y]->set_text(""); + my $size = $self->{size}; + + my $border = int ($s / $size); + my $s2 = $s - $border * 2; + my $edge = int ($s2 / $size) | 1; + my $ofs = int ($edge / 2); + + my @k = map int ($s2 * $_ / $size - $ofs + $border + 0.5), 0 .. $size; + + unless ($self->{background}) { + my $pixbuf; + + my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); + + if ($s < $bw && $s < $bh) { + $pixbuf = new_pixbuf $s, $s, 1, 0; + $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); + } else { + $pixbuf = scale_pixbuf $::board_img, $s, $s, INTERP_TILES; } + + my $linew = int ($s / 300); + + 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; + + $a++; + $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... + } + + $self->{background} = $pixbuf; } - for (0..$self->{node}) { - while (my ($k, $v) = each %{$self->{tree}[$_]}) { - if ($k eq "move7") { - if ($v->[1] < 255) { - $self->{board}[$v->[1]][$v->[2]]->set_text(("X", "O", "-")[$v->[0]]); - } + my $pixbuf = $self->{pixbuf} = $self->{background}->copy; + + # hoshi-points(!)#d# + # caching of empty board gfx(!)#d# + + for my $x (1 .. $size) { + for my $y (1 .. $size) { + my $mark = $self->{board}{board}[$x-1][$y-1]; + + 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, INTERP_NEAREST, 255); + + #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 ); + + #$gc->set_clip_mask ($bm); + #$gc->set_clip_origin ($dx, $dy); + #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge); } } } } -package KGS::Game::Board; -package KGS::Game::Node; -package KGS::Game::Tree; +sub expose_event { + my ($widget, $self, $event) = @_; + + $self->{pixbuf} or return; + + my ($ox, $oy, $s) = @{$self->{offsets}}; + + my ($x, $y, $w, $h) = + @{Gtk::Gdk::Rectangle->intersect( + $event->{area}, + [$ox, $oy, $s, $s] + )}; + + if (defined $x) { + $self->{pixbuf}->render_to_drawable ($self->{canvas}->window, $self->{canvas}->style->white_gc, + $x - $ox, $y - $oy, $x, $y, $w, $h); + #$self->{canvas}->window->draw_pixmap ( + # $self->{canvas}->style->white_gc, + # $self->{pixmap}, + # $x - $ox, $y - $oy, $x, $y, $w, $h, + #); + } + 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; + + # force a redraw (not perfect(?)) + expose_event $self->{canvas}, $self, { area => $self->{canvas}->allocation }; + + $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}); +} + +sub event_move { + ::play_sound "move"; +} 1;