ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/kgsueme/bin/kgsueme
(Generate patch)

Comparing kgsueme/bin/kgsueme (file contents):
Revision 1.7 by pcg, Thu May 29 07:30:17 2003 UTC vs.
Revision 1.15 by pcg, Fri May 30 04:17:25 2003 UTC

… …
2 2
3#use PApp::Util qw(dumpval); # debug only 3#use PApp::Util qw(dumpval); # debug only
4 4
5use Gtk; 5use Gtk;
6use Gtk::Gdk; 6use Gtk::Gdk;
7#use Gtk::Gdk::Pixbuf; 7use Gtk::Gdk::Pixbuf;
8use Gtk::Gdk::ImlibImage; 8#use Gtk::Gdk::ImlibImage;
9
10use Gnome;
11 9
12use KGS::Protocol; 10use KGS::Protocol;
13use KGS::Listener::Debug; 11use KGS::Listener::Debug;
14 12
15use IO::Socket::INET; 13use IO::Socket::INET;
16 14
17use Errno; 15use Errno;
18 16
19init Gnome "kgsueme"; 17init Gtk;
20 18
21$HACK = 1; # do NEVER enable. ;) 19$HACK = 1; # do NEVER enable. ;)
22 20
23our $config; 21our $config;
24our $IMGDIR = "images"; 22our $IMGDIR = "images";
25 23
26sub load_img { 24sub load_img {
27# new_from_file Gtk::Gdk::Pixbuf "$IMGDIR/$_[0]" 25 new_from_file Gtk::Gdk::Pixbuf "$IMGDIR/$_[0]"
28 load_image Gtk::Gdk::ImlibImage "$IMGDIR/$_[0]" 26# load_image Gtk::Gdk::ImlibImage "$IMGDIR/$_[0]"
29 or die "$IMGDIR/$_[0]: $!"; 27 or die "$IMGDIR/$_[0]: $!";
30} 28}
31 29
32our @black_img = load_img "b01-100x102.png"; 30our @black_img = load_img "b-01.png";
33our @white_img = map +(load_img "w0$_-100x102_retouched.png"), 1,2,3; 31our @white_img = map +(load_img "w-0$_.png"), 1,2,3,4,5;
32our @triangle_img = map +(load_img "triangle-$_.png"), qw(b w);
33our @square_img = map +(load_img "square-$_.png"), qw(b w);
34our @circle_img = map +(load_img "circle-$_.png"), qw(b w);
34our $board_img = load_img "woodgrain-01.jpg"; 35our $board_img = load_img "woodgrain-01.jpg";
35 36
36{ 37{
37 use Storable (); 38 use Storable ();
38 use Scalar::Util (); 39 use Scalar::Util ();
39 40
… …
44 45
45 $config = $state->{config} ||= {}; 46 $config = $state->{config} ||= {};
46 47
47 # grr... more gtk+ brokenness 48 # grr... more gtk+ brokenness
48 my %get = ( 49 my %get = (
50 hpane_position => sub { ($_[0]->children)[0]->allocation->[2] },
51 vpane_position => sub { ($_[0]->children)[0]->allocation->[3] },
49 window_size => sub { [ @{$_[0]->allocation}[2,3] ] }, 52 window_size => sub { [ @{$_[0]->allocation}[2,3] ] },
50 #window_pos => sub { die PApp::Util::dumpval [ $_[0]->get_root_origin ] }, 53 #window_pos => sub { die PApp::Util::dumpval [ $_[0]->get_root_origin ] },
51 clist_column_widths => sub { 54 clist_column_widths => sub {
52 $_[0]{column_widths}; 55 $_[0]{column_widths};
53 }, 56 },
… …
135 $main->{status}->pop($context_id{$type}) if $context_id{$type}; 138 $main->{status}->pop($context_id{$type}) if $context_id{$type};
136 $main->{status}->push($context_id{$type} ||= $main->{status}->get_context_id($type), $text) if $text; 139 $main->{status}->push($context_id{$type} ||= $main->{status}->get_context_id($type), $text) if $text;
137 } 140 }
138} 141}
139 142
143if (0) {
144 my $board = new game size => 5;
145 $board->{window}->show_all;
146}
147
140main Gtk; 148main Gtk;
141 149
142############################################################################# 150#############################################################################
143 151
144package kgsueme; 152package kgsueme;
… …
296 304
297 $self->msg(list_rooms => group => $_) for 0..5; # fetch all room names (should not!) 305 $self->msg(list_rooms => group => $_) for 0..5; # fetch all room names (should not!)
298 $self->{window}->show_all; 306 $self->{window}->show_all;
299} 307}
300 308
301sub event_update { 309sub event_update_rooms {
302 my ($self) = @_; 310 my ($self) = @_;
303 311
304 $self->{event_update} ||= Gtk->timeout_add(200, sub { 312 $self->{event_update} ||= Gtk->timeout_add(200, sub {
305 my $l = $self->{roomlist}; 313 my $l = $self->{roomlist};
306 314
… …
383 ::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30]; 391 ::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30];
384 392
385 $self; 393 $self;
386} 394}
387 395
388sub event_update { 396sub event_update_users {
389 my ($self) = @_; 397 my ($self) = @_;
390 398
391 $self->{event_update} ||= Gtk->timeout_add(200, sub { 399 $self->{event_update} ||= Gtk->timeout_add(200, sub {
392 my $l = $self->{userlist}; 400 my $l = $self->{userlist};
393 401
… …
444 my ($self) = @_; 452 my ($self) = @_;
445 $self->SUPER::part; 453 $self->SUPER::part;
446 454
447 delete $::config->{rooms}{$self->{channel}}; 455 delete $::config->{rooms}{$self->{channel}};
448 $self->{window}->hide_all; 456 $self->{window}->hide_all;
449 $self->event_update; 457 $self->event_update_users;
450 $self->event_update_games; 458 $self->event_update_games;
451} 459}
452 460
453sub event_join { 461sub event_join {
454 my ($self) = @_; 462 my ($self) = @_;
… …
473############################################################################# 481#############################################################################
474 482
475package game; 483package game;
476 484
477use KGS::Constants; 485use KGS::Constants;
486use KGS::Game::Board;
478 487
479use base KGS::Listener::Game; 488use base KGS::Listener::Game;
480use base KGS::Game; 489use base KGS::Game;
481 490
482sub new { 491sub new {
… …
484 $self = $self->SUPER::new(@_); 493 $self = $self->SUPER::new(@_);
485 494
486 $self->listen($self->{conn}); 495 $self->listen($self->{conn});
487 496
488 $self->{window} = new Gtk::Window 'toplevel'; 497 $self->{window} = new Gtk::Window 'toplevel';
489 $self->{window}->set_title("KGS Game ".$self->user0." ".$self->user1); 498 $self->{window}->set_title("KGS Game ".$self->user0." ".$self->user1) if $self->{channel};#d#
490 ::state $self->{window}, "game::window", undef, window_size => [600, 500]; 499 ::state $self->{window}, "game::window", undef, window_size => [600, 500];
491 500
492 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 }); 501 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 });
493 502
494 $self->{window}->add(my $hpane = new Gtk::HPaned); 503 $self->{window}->add(my $hpane = new Gtk::HPaned);
495 ::state $hpane, "game::hpane", undef, hpane_position => 500; 504 ::state $hpane, "game::hpane", undef, hpane_position => 500;
496 505
497 $::config{aa}++; 506 Gtk::Widget->push_visual (Gtk::Gdk::Rgb->get_visual);
498 $self->{canvas} = $::config{aa} ? new_aa Gnome::Canvas : new Gnome::Canvas; 507 Gtk::Widget->push_colormap (Gtk::Gdk::Rgb->get_cmap);
499 $hpane->add($self->{canvas}); 508 $hpane->pack1(($self->{canvas} = new Gtk::DrawingArea), 1, 1);
509 Gtk::Widget->pop_colormap;
510 Gtk::Widget->pop_visual;
500 511
501 $self->{canvas}->signal_connect(size_allocate => sub { 512 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
502 warn "@_ @{$_[1]}"; 513 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
503 #$self->{canvas}->set_pixels_per_unit(
504 });
505 514
506 my $line_colour = $::config{line_colour} || "darkbrown";
507 my $border = 0.1;
508
509 $self->{canvas}->set_pixels_per_unit(300);
510 $self->{canvas}->set_scroll_region(-$border,-$border,1+$border,1+$border);
511
512 {
513 my $croot = $self->{canvas}->root;
514 my $cgroup = $croot; #->new($croot, "Gnome::CanvasGroup");
515
516 if ($::board_img) {
517 $cgroup->new($cgroup, "Gnome::CanvasImage",
518 x => -$border, y => -$border,
519 width => 1+$border*2, height => 1+$border*2,
520 image => $::board_img,
521 anchor => "nw"
522 );
523 } else {
524 die;
525 $cgroup->new($cgroup, "Gnome::CanvasRect",
526 x1 => -$border, x2 => 1+$border,
527 y1 => -$border, y2 => 1+$border,
528 outline_color => "black",
529 fill_color => "brown",
530 width_pixels => 2,
531 );
532 }
533
534 my $x1 = $pad * 2; # == my $y1 = 30;
535 my $x2 = $w - ($pad * 2); # == my $y2 = 270;
536 my $w = $x2 - $x1;
537 my $s = $self->{size} - 1;
538 my $ofs = 0.5 / $self->{size};
539
540 my $a = "A";
541 for my $i (1 .. $self->{size}) { # one more iteration for the last lines
542 my $k = $i / $self->{size} - $ofs;
543
544 $cgroup->new($cgroup, "Gnome::CanvasLine",
545 points => [ $k,$ofs, $k,1-$ofs ],
546 fill_color => $line_colour,
547 width_pixels => 1);
548
549 $cgroup->new($cgroup, "Gnome::CanvasLine",
550 points => [ $ofs,$k, 1-$ofs,$k ],
551 fill_color => $line_colour,
552 width_pixels => 1);
553
554 for ( [$k,-$border*0.5,$a], [$k,1+$border*0.5,$a], [-$border*0.5,$k,$i], [1+$border*0.5,$k,$i] ) {
555 my ($x, $y, $text) = @$_;
556
557 my $text = $cgroup->new($cgroup, "Gnome::CanvasText",
558 x => 0, y => 0, text => $text,
559 justification => "center",
560 anchor => "center",
561 font => "-*-helvetica-medium-r-*--34-*",
562 fill_color => $line_colour);
563
564 $text->affine_relative($border*0.015,0, 0,$border*0.015, $x,$y);
565 }
566
567 $a++;
568 }
569
570 my $stones = [[]];
571
572 for my $x (1 .. $self->{size}) {
573 my $xk = $x / $self->{size} - $ofs;
574 for my $y (1 .. $self->{size}) {
575 my $yk = $y / $self->{size} - $ofs;
576
577 my $col = $stones->[$x-1][$y-1] = [];
578
579 if (1) {
580 $col->[0] =
581 $cgroup->new($cgroup, "Gnome::CanvasImage",
582 x => $xk, y => $yk,
583 width => $ofs*2, height => $ofs*2,
584 image => $::black_img[int rand @::black_img],
585 anchor => "center");
586 $col->[1] =
587 $cgroup->new($cgroup, "Gnome::CanvasImage",
588 x => $xk, y => $yk,
589 width => $ofs*2, height => $ofs*2,
590 image => $::white_img[int rand @::white_img],
591 anchor => "center");
592 } else {
593 # too large, scale has NO effect
594 $col->[0] =
595 $cgroup->new($cgroup, "Gnome::CanvasEllipse",
596 x1 => $xk, x2 => $xk + 0.001,
597 y1 => $yk, y2 => $yk + 0.001,
598 outline_color => "black", width_pixels => 2,
599 fill_color => "black");
600 $col->[1] =
601 $cgroup->new($cgroup, "Gnome::CanvasEllipse",
602 x1 => $xk, x2 => $xk + 0.001,
603 y1 => $yk, y2 => $yk + 0.001,
604 outline_color => "black", width_pixels => 2,
605 fill_color => "white");
606 }
607 }
608 }
609
610 $self->{board_gfx}->{stones} = $stones;
611 }
612
613 $hpane->add(my $vpane = new Gtk::VPaned); 515 $hpane->pack2((my $vpane = new Gtk::VPaned), 0, 0);
614 ::state $vpane, "game", $self->{name}, vpane_position => 80; 516 ::state $vpane, "game", $self->{name}, vpane_position => 80;
615 517
616 $vpane->add(my $sw = new Gtk::ScrolledWindow); 518 $vpane->add(my $sw = new Gtk::ScrolledWindow);
617 $sw->set_policy("automatic", "always"); 519 $sw->set_policy("automatic", "always");
618 520
… …
635 }); 537 });
636 538
637 $self; 539 $self;
638} 540}
639 541
640sub event_update { 542sub event_update_users {
543 my ($self) = @_;
544
545 room::event_update_users $self;
546}
547
548sub join {
549 my ($self) = @_;
550 $self->SUPER::join;
551
552 $self->{window}->show_all;
553}
554
555sub part {
556 my ($self) = @_;
557 $self->SUPER::part;
558
559 $self->{window}->hide;
560}
561
562sub configure_event {
563 my ($widget, $self, $event) = @_;
564 delete $self->{stack};
565 $self->repaint_board;
566 1;
567}
568
569sub expose_event {
570 my ($widget, $self, $event) = @_;
571
572 $self->{pixmap} or return;
573
574 my ($ox, $oy, $s) = @{$self->{offsets}};
575
576 my ($x, $y, $w, $h) =
577 @{Gtk::Gdk::Rectangle->intersect(
578 $event->{area},
579 [$ox, $oy, $s, $s]
580 )};
581
582 $self->{canvas}->window->draw_pixmap (
583 $self->{canvas}->style->white_gc,
584 $self->{pixmap},
585 $x - $ox, $y - $oy, $x, $y, $w, $h,
586 );
587 1;
588}
589
590# create new, _transparent_ pixbuf
591sub new_pixbuf {
592 my ($w, $h) = @_;
593
594 $pixbuf;
595}
596
597sub INTERP_TILES (){ 1 }
598sub INTERP_BILINEAR (){ 2 }
599sub INTERP_HYPER (){ 3 }
600
601sub new_pixbuf {
602 my ($w, $h, $clear) = @_;
603
604 my $pixbuf = new Gtk::Gdk::Pixbuf 'rgb', 1, 8, $w, $h;
605
606 if ($clear) { # damn, need to clear it ourselves
607 my $row = "\x00\x00\x00\x00" x $w;
608 $pixbuf->put_pixels ($row, $_, 0) for 0 .. $h - 1;
609 }
610
611 $pixbuf;
612}
613
614sub scale_pixbuf {
615 my ($src, $w, $h, $mode) = @_;
616
617 my $dst = new_pixbuf $w, $h;
618
619 $src->scale(
620 $dst, 0, 0, $w, $h, 0, 0,
621 $w / $src->get_width, $h / $src->get_height,
622 $mode,
623 );
624
625 $dst;
626}
627
628sub label_font {
641 my ($self) = @_; 629 my ($size) = @_;
642 630
643 $self->{event_update} ||= Gtk->timeout_add(200, sub { 631 $size = int $size;
644 my $l = $self->{userlist}; 632 $size = 34 if $size > 34;
645 633
646 $l->freeze; 634 # I am soo incapable
647 my $pos = $l->get_vadjustment->get_value; 635 for (8, 10, 11, 12, 14, 17, 18, 20, 24, 25, 34) {
648 $l->clear; 636 next unless $size <= $_;
637 my $font = Gtk::Gdk::Font->fontset_load ("-*-helvetica-bold-r-*--$_-*");
638 return $font if $font;
639 }
640
641 return Gtk::Gdk::Font->fontset_load ("-*-helvetica-bold-r-*--8-*");
642}
649 643
650 my $row = 0; 644sub center_text {
651 for (values %{$self->{users}}) { 645 my ($drawable, $font, $gc, $x, $y, $t) = @_;
652 $l->append($_->{name}); 646 my $w = $font->string_width ($t);
653 $l->set_row_data($row++, $_); 647 my $h = $font->string_height($t) - $font->descent;
648 $drawable->draw_text ($font, $gc, $x - $w*0.5, $y + $h * 0.5, $t, length $t);
649}
650
651# create a stack of stones
652sub create_stack {
653 my ($self, $gc, $mark, $size, $rand) = @_;
654
655 my $c = \$self->{stack}{$mark};
656 unless ($$c) {
657 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
658 my $base =
659 $mark & (MARK_B | MARK_GRAY_B | MARK_W | MARK_GRAY_W)
660 ? scale_pixbuf $stone, $size, $size, INTERP_HYPER
661 : new_pixbuf $size, $size, 1;
662
663 if ($mark & (MARK_GRAY_B | MARK_GRAY_W)) {
664 # make transparent by stippling :(
665 # fix this to use compositing if/when we have full compositing support
666 # in kgsueme
667 my @row = (
668 "\xff\xff\xff\xff\x00\x00\x00\x00" x ($size / 2 + 1),
669 "\x00\x00\x00\x00\xff\xff\xff\xff" x ($size / 2 + 1),
670 );
671 $base->put_pixels ($base->get_pixels ($_) & $row[$_ & 1], $_, 0)
672 for 0 .. $size - 1;
673 }
674
675 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
676 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
677 my ($mask, $img) = @$_;
678 if ($mark & $mask) {
679 $img->composite (
680 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4) x 2,
681 $size / $img->get_width / 2, $size / $img->get_height / 2,
682 INTERP_HYPER, 192
683 );
684 }
685 }
686
687 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
688
689 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
690 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
691 [MARK_SQUARE, $::square_img[$dark_bg]]) {
692 my ($mask, $img) = @$_;
693 if ($mark & $mask) {
694 $img->composite (
695 $base, 0, 0, $size, $size, 0, 0,
696 ($size - 1) / ($img->get_width - 1), ($size - 1) / ($img->get_height - 1),
697 INTERP_HYPER, 255
698 );
699 }
700 }
701
702 push @$$c, [$base->render_pixmap_and_mask (128)];
654 } 703 }
655 $l->sort; 704 }
656 $l->get_vadjustment->set_value($pos);
657 $l->thaw;
658 705
659 delete $self->{event_update}; 706 @{$$c->[$rand % @$$c]};
707}
708
709sub repaint_board {
710 my ($self) = @_;
711 my $canvas = $self->{canvas};
712
713 %cache = ();
714
715 my ($w, $h) = @{$canvas->allocation}[2,3];
716
717 my $s = $w > $h ? $h : $w;
718
719 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
720
721 my $pixmap = $self->{pixmap} = new Gtk::Gdk::Pixmap $self->{canvas}->window, $s, $s;
722
723 {
724 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
725
726 my $bg = $s < $bw && $s < $bh ? $::board_img : scale_pixbuf $::board_img, $s, $s, INTERP_TILES;
727 $bg->render_to_drawable(
728 $pixmap, $self->{canvas}->style->white_gc,
729 0, 0, 0, 0, $s, $s,
730 0, 0, 0
660 0; 731 );
661 }); 732 }
662}
663 733
664sub join { 734 my $gc = Gtk::Gdk::GC->new ($pixmap);
665 my ($self) = @_;
666 $self->SUPER::join;
667 735
668 $self->{window}->show_all; 736 $gc->rgb_gc_set_foreground($line_colour);
669} 737 $gc->set_line_attributes (int ($s / 300) + 1, 'solid', 'projecting', 'miter');
670 738
671sub part { 739 my $size = $self->{size};
672 my ($self) = @_; 740 my $border = int ($s / $size);
673 $self->SUPER::part; 741 my $s2 = $s - $border * 2;
742 my $edge = int ($s2 / $size) | 1;
743 my $ofs = int ($edge / 2);
674 744
675 $self->{window}->hide_all; 745 my $font = label_font $ofs;
676 $self->event_update; 746
747 my @k = map int ($s2 * $_ / $size - $ofs + $border + 0.5), 0 .. $size;
748
749 my $a = "A";
750 for my $i (1 .. $size) {
751 $pixmap->draw_line ($gc, $k[$i], $k[1], $k[$i], $k[$size]);
752 $pixmap->draw_line ($gc, $k[1], $k[$i], $k[$size], $k[$i]);
753
754 center_text $pixmap, $font, $gc, $k[$i], ($ofs +$border) / 2, $a;
755 center_text $pixmap, $font, $gc, $k[$i], $s2 + $border + $ofs / 2, $a;
756 center_text $pixmap, $font, $gc, ($ofs + $border) / 2, $k[$i], $i;
757 center_text $pixmap, $font, $gc, $s2 + $border + $ofs / 2, $k[$i], $i;
758
759 $a++;
760 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
761 }
762
763 # hoshi-points(!)#d#
764 # caching of empty board gfx(!)#d#
765
766 if ($self->{board}) {
767 for my $x (1 .. $size) {
768 for my $y (1 .. $size) {
769 my $yk = $s2 * $x / $size - $ofs + $border;
770 my $mark = $self->{board}{board}[$x-1][$y-1];
771
772 if ($mark) {
773 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
774 my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
775
776 $gc->set_clip_mask ($bm);
777 $gc->set_clip_origin ($dx, $dy);
778 $pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
779 }
780 }
781 }
782 }
677} 783}
678 784
679sub event_update_tree { 785sub event_update_tree {
680 my ($self) = @_; 786 my ($self) = @_;
681 787
682 my $board = new KGS::Game::Board $self->{size}; 788 $self->{board} = new KGS::Game::Board $self->{size};
683 $board->interpret_path ($self->get_path); 789 $self->{board}->interpret_path ($self->get_path);
684 790
685# if (not defined $self->{board_pm}) { 791 $self->repaint_board;
686# $self->{board_pm} = new Gtk::Gdk::Pixmap ($self->{board}->window, 100, 100, -1);
687# $self->{board_pm}->draw_rectangle($self->{board}->style->white_gc, 1, 0, 0, 100, 100);
688# }
689# my $red = $self->{board}->window->get_colormap->color_alloc( { red => 65000, green => 0, blue => 0 } );
690# my $red_gc = new Gtk::Gdk::GC ( $self->{board}->window );
691# $red_gc->set_foreground( $red );
692#
693# my $px = $self->{board_pm};
694 792
695 for my $x (0 .. $self->{size} - 1) { 793 # force a redraw (not perfect(?))
696 for my $y (0 .. $self->{size} - 1) { 794 expose_event $self->{canvas}, $self, { area => $self->{canvas}->allocation };
697 my $v = $board->{board}[$x][$y];
698 795
699 $v & MARK_B 796 $self->{text}->backward_delete($self->{text}->get_length);
700 ? $self->{board_gfx}->{stones}->[$x][$y][0]->show 797 $self->{text}->insert(undef, undef, undef, $self->{board}{comment}.PApp::Util::dumpval([$self->{board}{time},$self->{board}{captures}]));
701 : $self->{board_gfx}->{stones}->[$x][$y][0]->hide;
702 $v & MARK_W
703 ? $self->{board_gfx}->{stones}->[$x][$y][1]->show
704 : $self->{board_gfx}->{stones}->[$x][$y][1]->hide;
705 }
706 }
707} 798}
708 799
7091; 8001;
710 801
711 802

Diff Legend

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