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

Comparing kgsueme/bin/kgsueme (file contents):
Revision 1.15 by pcg, Fri May 30 04:17:25 2003 UTC vs.
Revision 1.29 by pcg, Sat May 31 05:30:49 2003 UTC

1#!/usr/bin/perl -I../lib/ 1#!/usr/bin/perl
2
3#use PApp::Util qw(dumpval); # debug only
4 2
5use Gtk; 3use Gtk;
6use Gtk::Gdk; 4use Gtk::Gdk;
7use Gtk::Gdk::Pixbuf; 5use Gtk::Gdk::Pixbuf;
8#use Gtk::Gdk::ImlibImage; 6#use Gtk::Gdk::ImlibImage;
9 7
10use KGS::Protocol; 8use KGS::Protocol;
11use KGS::Listener::Debug; 9use KGS::Listener::Debug;
12 10
11use Audio::Data;
12use Audio::Play;
13
13use IO::Socket::INET; 14use IO::Socket::INET;
14 15use List::Util;
15use Errno; 16use Errno;
16 17
17init Gtk; 18init Gtk;
18 19
19$HACK = 1; # do NEVER enable. ;) 20our $HACK = 1; # do NEVER enable. ;)
21our $DEBUG_EXPOSE = 0;
22
23if ($HACK) {
24 $KGS::debug = 1;
25}
26
27our $VERSION = "0.1";
20 28
21our $config; 29our $config;
30our $LIBDIR = ".";
22our $IMGDIR = "images"; 31our $IMGDIR = "$LIBDIR/images";
32our $SNDDIR = "$LIBDIR/sounds";
23 33
24sub load_img { 34sub load_img {
25 new_from_file Gtk::Gdk::Pixbuf "$IMGDIR/$_[0]" 35 new_from_file Gtk::Gdk::Pixbuf "$IMGDIR/$_[0]"
26# load_image Gtk::Gdk::ImlibImage "$IMGDIR/$_[0]" 36# load_image Gtk::Gdk::ImlibImage "$IMGDIR/$_[0]"
27 or die "$IMGDIR/$_[0]: $!"; 37 or die "$IMGDIR/$_[0]: $!";
28} 38}
39
40my @fontchars = ('A' .. 'Z', 0 .. 9);
29 41
30our @black_img = load_img "b-01.png"; 42our @black_img = load_img "b-01.png";
31our @white_img = map +(load_img "w-0$_.png"), 1,2,3,4,5; 43our @white_img = map +(load_img "w-0$_.png"), 1,2,3,4,5;
32our @triangle_img = map +(load_img "triangle-$_.png"), qw(b w); 44our @triangle_img = map +(load_img "triangle-$_.png"), qw(b w);
33our @square_img = map +(load_img "square-$_.png"), qw(b w); 45our @square_img = map +(load_img "square-$_.png"), qw(b w);
34our @circle_img = map +(load_img "circle-$_.png"), qw(b w); 46our @circle_img = map +(load_img "circle-$_.png"), qw(b w);
35our $board_img = load_img "woodgrain-01.jpg"; 47our $board_img = load_img "woodgrain-01.jpg";
36 48
49our @font = (
50 [map +(load_img "font/$_-black.png"), @fontchars],
51 [map +(load_img "font/$_-white.png"), @fontchars],
52 );
53our %fontmap;
54@fontmap{@fontchars} = (0..25 + 10);
55@fontmap{'a' .. 'z'} = (0..25);
56
57{
58 #my $audioserver = new Audio::Play(0);
59 my %sound;
60 $SIG{CHLD} = 'IGNORE';
61
62 for (qw(alarm warning move pass ring connect user_unknown)) {
63 local $/;
64 open my $snd, "<", "$SNDDIR/$_"
65 or die "$SNDDIR/$_: $!";
66 binmode $snd;
67
68 $sound{$_} = new Audio::Data;
69 $sound{$_}->Load($snd);
70 }
71
72 sub play_sound {
73 my ($annoyancy, $sound) = @_;
74 # annoyany 1 => important, annoyance 2 => useful, annoyancy 3 => not useful
75 if (fork == 0) {
76 if (my $audioserver = new Audio::Play(1)) {
77 $audioserver->play ($sound{$sound});
78 }
79 Gtk->_exit(0);
80 }
81 }
82}
83
37{ 84{
38 use Storable (); 85 use Storable ();
39 use Scalar::Util (); 86 use Scalar::Util ();
40 87
41 my $staterc = "$ENV{HOME}/.kgsueme"; 88 my $staterc = "$ENV{HOME}/.kgsueme";
42 89
43 my $state = -r $staterc ? Storable::retrieve($staterc) : {}; 90 my $state = -r $staterc ? Storable::retrieve($staterc) : {};
44 my @widgets; 91 my @widgets;
45 92
46 $config = $state->{config} ||= {}; 93 $config = $state->{config} ||= {};
94
95 $config->{speed} = 1;#d# optimize for speed or memory?
96 $config->{conserve_memory} = 0; # try to conserve memory at the expense of speed
97 $config->{randomize} = 0; # randomize placement of stones
47 98
48 # grr... more gtk+ brokenness 99 # grr... more gtk+ brokenness
49 my %get = ( 100 my %get = (
50 hpane_position => sub { ($_[0]->children)[0]->allocation->[2] }, 101 hpane_position => sub { ($_[0]->children)[0]->allocation->[2] },
51 vpane_position => sub { ($_[0]->children)[0]->allocation->[3] }, 102 vpane_position => sub { ($_[0]->children)[0]->allocation->[3] },
52 window_size => sub { [ @{$_[0]->allocation}[2,3] ] }, 103 window_size => sub { [ @{$_[0]->allocation}[2,3] ] },
53 #window_pos => sub { die PApp::Util::dumpval [ $_[0]->get_root_origin ] }, 104 #window_pos => sub { die KGS::Listener::Debug::dumpval [ $_[0]->get_root_origin ] },
54 clist_column_widths => sub { 105 clist_column_widths => sub {
55 $_[0]{column_widths}; 106 $_[0]{column_widths};
56 }, 107 },
57 ); 108 );
58 109
… …
139 $main->{status}->push($context_id{$type} ||= $main->{status}->get_context_id($type), $text) if $text; 190 $main->{status}->push($context_id{$type} ||= $main->{status}->get_context_id($type), $text) if $text;
140 } 191 }
141} 192}
142 193
143if (0) { 194if (0) {
144 my $board = new game size => 5; 195 use KGS::Constants;
196
197 for (19) {
198 my $board = new game %{Storable::retrieve "testboard.storable"};
199
200 if (0) {
201 $board->{board} = new KGS::Game::Board;
202 $board->{board}{board}[0][0] = MARK_B;
203 $board->{board}{board}[1][1] = MARK_GRAY_B | MARK_SMALL_W;
204 $board->{board}{board}[2][2] = MARK_W | MARK_TRIANGLE;
205 $board->{board}{board}[1][2] = MARK_B | MARK_LABEL;
206 $board->{board}{label}[1][2] = "198";
207 $board->{board}{board}[0][2] = MARK_W | MARK_LABEL;
208 $board->{board}{label}[0][2] = "AWA";
209 }
145 $board->{window}->show_all; 210 $board->{window}->show_all;
211 }
146} 212}
147 213
148main Gtk; 214main Gtk;
149 215
150############################################################################# 216#############################################################################
… …
157 my $self = shift; 223 my $self = shift;
158 $self = $self->SUPER::new(@_); 224 $self = $self->SUPER::new(@_);
159 225
160 $self->{conn} = new KGS::Protocol; 226 $self->{conn} = new KGS::Protocol;
161 227
162 KGS::Listener::Debug->new->listen($self->{conn}); #d# debug only :) 228 KGS::Listener::Debug->new->listen($self->{conn}, "any"); #d# debug only :)
163 229
164 $self->listen($self->{conn}); 230 $self->listen($self->{conn}, "login");
165 231
166 $self->{roomlist} = new roomlist conn => $self->{conn}; 232 $self->{roomlist} = new roomlist conn => $self->{conn};
167 233
168 $self->{window} = new Gtk::Window 'toplevel'; 234 $self->{window} = new Gtk::Window 'toplevel';
169 $self->{window}->set_title('kgsueme'); 235 $self->{window}->set_title('kgsueme');
… …
232 } 298 }
233 $self->{conn}->feed_data($buf); 299 $self->{conn}->feed_data($buf);
234 }; 300 };
235 301
236 # now login 302 # now login
237 $self->{conn}->login($self->{login}->get_text, $self->{password}->get_text); 303 $self->{conn}->login("kgsueme $VERSION $^O", $self->{login}->get_text, $self->{password}->get_text);
238} 304}
239 305
240sub inject_login { 306sub inject_login {
241 my ($self, $msg) = @_; 307 my ($self, $msg) = @_;
242 308
… …
245 311
246 if ($msg->{success}) { 312 if ($msg->{success}) {
247 for (keys %{$::config->{rooms}}) { 313 for (keys %{$::config->{rooms}}) {
248 $self->{roomlist}->join_room($_); 314 $self->{roomlist}->join_room($_);
249 } 315 }
316 ::play_sound 3, "connect";
317 } elsif ($msg->{result} eq "user unknown") {
318 ::play_sound 2, "user_unknown";
319 } else {
320 ::play_sound 2, "warning";
250 } 321 }
251
252 warn PApp::Util::dumpval($::config);
253} 322}
254 323
255sub event_disconnect { } 324sub event_disconnect { }
256 325
257############################################################################# 326#############################################################################
… …
338 407
339sub new { 408sub new {
340 my $self = shift; 409 my $self = shift;
341 $self = $self->SUPER::new(@_); 410 $self = $self->SUPER::new(@_);
342 411
343 $self->listen($self->{conn}); 412 $self->listen($self->{conn}, qw(msg_room:));
344 413
345 $self->{window} = new Gtk::Window 'toplevel'; 414 $self->{window} = new Gtk::Window 'toplevel';
346 $self->{window}->set_title("KGS Room $self->{name}"); 415 $self->{window}->set_title("KGS Room $self->{name}");
347 ::state $self->{window}, "room::window", $self->{name}, window_size => [600, 400]; 416 ::state $self->{window}, "room::window", $self->{name}, window_size => [600, 400];
348 417
… …
362 ::state $self->{gamelist}, "room::gamelist", $self->{name}, clist_column_widths => [20, 120, 120, 120]; 431 ::state $self->{gamelist}, "room::gamelist", $self->{name}, clist_column_widths => [20, 120, 120, 120];
363 432
364 $self->{gamelist}->signal_connect(select_row => sub { 433 $self->{gamelist}->signal_connect(select_row => sub {
365 my $game = $self->{gamelist}->get_row_data($_[1]) 434 my $game = $self->{gamelist}->get_row_data($_[1])
366 or return; 435 or return;
367 $self->{game}{$game->{channel}} ||= new game %$game, conn => $self->{conn}; 436 $self->{game}{$game->{channel}} ||= new game %$game, conn => $self->{conn}, room => $self;
368 $self->{game}{$game->{channel}}->join; 437 $self->{game}{$game->{channel}}->join;
369 $self->{gamelist}->unselect_all; 438 $self->{gamelist}->unselect_all;
370 }); 439 });
371 440
372 $vpane->add(my $vbox = new Gtk::VBox); 441 $vpane->add(my $vbox = new Gtk::VBox);
… …
391 ::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30]; 460 ::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30];
392 461
393 $self; 462 $self;
394} 463}
395 464
465sub join {
466 my ($self) = @_;
467 $self->SUPER::join;
468
469 $self->{window}->show_all;
470}
471
472sub part {
473 my ($self) = @_;
474 $self->SUPER::part;
475
476 delete $::config->{rooms}{$self->{channel}};
477 $self->{window}->hide_all;
478}
479
480sub inject_msg_room {
481 my ($self, $msg) = @_;
482
483 $self->{text}->insert(undef, undef, undef, "\n$msg->{name}: $msg->{message}");
484}
485
396sub event_update_users { 486sub event_update_users {
397 my ($self) = @_; 487 my ($self) = @_;
398 488
489 Gtk->timeout_remove (delete $self->{update_users}) if $self->{update_users};
399 $self->{event_update} ||= Gtk->timeout_add(200, sub { 490 $self->{update_users} ||= Gtk->timeout_add(100, sub {
491 return unless $self->{joined};
492
400 my $l = $self->{userlist}; 493 my $l = $self->{userlist};
401 494
402 $l->freeze; 495 $l->freeze;
403 my $pos = $l->get_vadjustment->get_value; 496 my $pos = $l->get_vadjustment->get_value;
404 $l->clear; 497 $l->clear;
… …
410 } 503 }
411 $l->sort; 504 $l->sort;
412 $l->get_vadjustment->set_value($pos); 505 $l->get_vadjustment->set_value($pos);
413 $l->thaw; 506 $l->thaw;
414 507
415 delete $self->{event_update}; 508 delete $self->{update_users};
416 0;
417 }); 509 });
418} 510}
419 511
420sub event_update_games { 512sub event_update_games {
421 my ($self) = @_; 513 my ($self) = @_;
… …
439 delete $self->{event_update_games}; 531 delete $self->{event_update_games};
440 0; 532 0;
441 }); 533 });
442} 534}
443 535
444sub join {
445 my ($self) = @_;
446 $self->SUPER::join;
447
448 $self->{window}->show_all;
449}
450
451sub part {
452 my ($self) = @_;
453 $self->SUPER::part;
454
455 delete $::config->{rooms}{$self->{channel}};
456 $self->{window}->hide_all;
457 $self->event_update_users;
458 $self->event_update_games;
459}
460
461sub event_join { 536sub event_join {
462 my ($self) = @_; 537 my ($self) = @_;
463 $self->SUPER::event_join; 538 $self->SUPER::event_join;
464 539
465 $::config->{rooms}{$self->{channel}} = 1; 540 $::config->{rooms}{$self->{channel}} = 1;
… …
467 542
468sub event_update_roominfo { 543sub event_update_roominfo {
469 my ($self) = @_; 544 my ($self) = @_;
470 545
471 $self->{text}->insert(undef, undef, undef, "\n$self->{owner}: $self->{description}\n"); 546 $self->{text}->insert(undef, undef, undef, "\n$self->{owner}: $self->{description}\n");
472}
473
474sub inject_msg_room {
475 my ($self, $msg) = @_;
476 return unless $self->{channel} == $msg->{channel};
477
478 $self->{text}->insert(undef, undef, undef, "\n$msg->{name}: $msg->{message}");
479} 547}
480 548
481############################################################################# 549#############################################################################
482 550
483package game; 551package game;
… …
493 $self = $self->SUPER::new(@_); 561 $self = $self->SUPER::new(@_);
494 562
495 $self->listen($self->{conn}); 563 $self->listen($self->{conn});
496 564
497 $self->{window} = new Gtk::Window 'toplevel'; 565 $self->{window} = new Gtk::Window 'toplevel';
498 $self->{window}->set_title("KGS Game ".$self->user0." ".$self->user1) if $self->{channel};#d# 566 my $title = $self->{channel} ? $self->user0." ".$self->user1 : "Game Window";
567 $self->{window}->set_title("KGS Game $title");
499 ::state $self->{window}, "game::window", undef, window_size => [600, 500]; 568 ::state $self->{window}, "game::window", undef, window_size => [600, 500];
500 569
501 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 }); 570 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 });
502 571
503 $self->{window}->add(my $hpane = new Gtk::HPaned); 572 $self->{window}->add(my $hpane = new Gtk::HPaned);
504 ::state $hpane, "game::hpane", undef, hpane_position => 500; 573 ::state $hpane, "game::hpane", undef, hpane_position => 500;
505 574
575 $hpane->pack1(my $vbox = new Gtk::VBox);
576
577 $vbox->pack_start((my $frame = new Gtk::Frame), 0, 1, 0);
578
579 {
580 $frame->add(my $vbox = new Gtk::VBox);
581 $vbox->add($self->{title} = new Gtk::Label $title);
582
583 $self->{moveadj} = new Gtk::Adjustment 0, 0, 0, 1, 10, 0;
584 $vbox->add(my $scale = new Gtk::HScale $self->{moveadj});
585 $scale->set_draw_value (1);
586 $scale->set_digits (0);
587 $scale->set_value_pos('top');
588
589 $self->{moveadj}->signal_connect (value_changed => sub {
590 $self->{board} = new KGS::Game::Board $self->{size};
591 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $self->{moveadj}->value - 1]]);
592
593 my $area = $self->repaint_board;
594
595 # force a redraw (not perfect(?))
596 $self->expose ($area);
597
598 $self->{text}->backward_delete($self->{text}->get_length);
599 $self->{text}->insert(undef, undef, undef, KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
600 });
601
602 $self->{moveadj}->upper (scalar @{$self->{path}}) if $self->{path};
603 }
604
506 Gtk::Widget->push_visual (Gtk::Gdk::Rgb->get_visual); 605 Gtk::Widget->push_visual (Gtk::Gdk::Rgb->get_visual);
507 Gtk::Widget->push_colormap (Gtk::Gdk::Rgb->get_cmap); 606 Gtk::Widget->push_colormap (Gtk::Gdk::Rgb->get_cmap);
508 $hpane->pack1(($self->{canvas} = new Gtk::DrawingArea), 1, 1); 607 $vbox->pack_start(($self->{canvas} = new Gtk::DrawingArea), 1, 1, 0);
509 Gtk::Widget->pop_colormap; 608 Gtk::Widget->pop_colormap;
510 Gtk::Widget->pop_visual; 609 Gtk::Widget->pop_visual;
511 610
512 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 611 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
513 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 612 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
… …
560} 659}
561 660
562sub configure_event { 661sub configure_event {
563 my ($widget, $self, $event) = @_; 662 my ($widget, $self, $event) = @_;
564 delete $self->{stack}; 663 delete $self->{stack};
664 delete $self->{pixbuf};
665 delete $self->{board_shown};
666 delete $self->{background};
565 $self->repaint_board; 667 $self->repaint_board;
566 1; 668 1;
567} 669}
568 670
569sub expose_event { 671sub INTERP_NEAREST (){ 1 }
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 } 672sub INTERP_TILES (){ 1 }
598sub INTERP_BILINEAR (){ 2 } 673sub INTERP_BILINEAR (){ 2 }
599sub INTERP_HYPER (){ 3 } 674sub INTERP_HYPER (){ 3 }
600 675
601sub new_pixbuf { 676sub new_pixbuf {
602 my ($w, $h, $clear) = @_; 677 my ($w, $h, $alpha, $clear) = @_;
603 678
604 my $pixbuf = new Gtk::Gdk::Pixbuf 'rgb', 1, 8, $w, $h; 679 my $pixbuf = new Gtk::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
605 680
606 if ($clear) { # damn, need to clear it ourselves 681 if ($clear) { # damn, need to clear it ourselves
607 my $row = "\x00\x00\x00\x00" x $w; 682 my $row = "\x00\x00\x00\x00" x $w;
608 $pixbuf->put_pixels ($row, $_, 0) for 0 .. $h - 1; 683 $pixbuf->put_pixels ($row, $_, 0) for 0 .. $h - 1;
609 } 684 }
… …
612} 687}
613 688
614sub scale_pixbuf { 689sub scale_pixbuf {
615 my ($src, $w, $h, $mode) = @_; 690 my ($src, $w, $h, $mode) = @_;
616 691
617 my $dst = new_pixbuf $w, $h; 692 my $dst = new_pixbuf $w, $h, 1;
618 693
619 $src->scale( 694 $src->scale(
620 $dst, 0, 0, $w, $h, 0, 0, 695 $dst, 0, 0, $w, $h, 0, 0,
621 $w / $src->get_width, $h / $src->get_height, 696 $w / $src->get_width, $h / $src->get_height,
622 $mode, 697 $mode,
623 ); 698 );
624 699
625 $dst; 700 $dst;
626} 701}
627 702
628sub label_font {
629 my ($size) = @_;
630
631 $size = int $size;
632 $size = 34 if $size > 34;
633
634 # I am soo incapable
635 for (8, 10, 11, 12, 14, 17, 18, 20, 24, 25, 34) {
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}
643
644sub center_text {
645 my ($drawable, $font, $gc, $x, $y, $t) = @_;
646 my $w = $font->string_width ($t);
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 703# create a stack of stones
652sub create_stack { 704sub create_stack {
653 my ($self, $gc, $mark, $size, $rand) = @_; 705 my ($self, $mark, $size, $rand) = @_;
706
707 my $shadow = $size * 0.05;
654 708
655 my $c = \$self->{stack}{$mark}; 709 my $c = \$self->{stack}{$mark};
656 unless ($$c) { 710 unless ($$c) {
657 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 711 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
658 my $base = 712 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 1;
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 713
714 # zeroeth the shadow
663 if ($mark & (MARK_GRAY_B | MARK_GRAY_W)) { 715 if ($mark & (MARK_B | MARK_W)) {
664 # make transparent by stippling :( 716 $::black_img[0]->composite (
665 # fix this to use compositing if/when we have full compositing support 717 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5,
666 # in kgsueme 718 $size / $stone->get_width, $size / $stone->get_height,
667 my @row = ( 719 $::config->{speed} ? INTERP_NEAREST : INTERP_TILES, 128
668 "\xff\xff\xff\xff\x00\x00\x00\x00" x ($size / 2 + 1), 720 );
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 } 721 }
674 722
723 # first the big stones (handicap stones different for effect)
724 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
725 [MARK_W, $mark & MARK_MOVE ? 255 : 192],
726 [MARK_GRAY_B, 128],
727 [MARK_GRAY_W, 128]) {
728 my ($mask, $alpha) = @$_;
729 if ($mark & $mask) {
730 $stone->composite (
731 $base, 0, 0, $size, $size, -0.5, -0.5,
732 $size / $stone->get_width, $size / $stone->get_height,
733 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, $alpha
734 );
735 }
736 }
737
738 # then the samll stones
675 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 739 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
676 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 740 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
677 my ($mask, $img) = @$_; 741 my ($mask, $img) = @$_;
678 if ($mark & $mask) { 742 if ($mark & $mask) {
679 $img->composite ( 743 $img->composite (
680 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4) x 2, 744 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2,
681 $size / $img->get_width / 2, $size / $img->get_height / 2, 745 $size / $img->get_width / 2, $size / $img->get_height / 2,
682 INTERP_HYPER, 192 746 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 192
683 ); 747 );
684 } 748 }
685 } 749 }
686 750
751 # and lastly any markers
687 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B)); 752 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
688 753
689 for ([MARK_CIRCLE, $::circle_img[$dark_bg]], 754 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
690 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 755 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
691 [MARK_SQUARE, $::square_img[$dark_bg]]) { 756 [MARK_SQUARE, $::square_img[$dark_bg]]) {
692 my ($mask, $img) = @$_; 757 my ($mask, $img) = @$_;
693 if ($mark & $mask) { 758 if ($mark & $mask) {
694 $img->composite ( 759 $img->composite (
695 $base, 0, 0, $size, $size, 0, 0, 760 $base, 0, 0, $size, $size, -0.5, -0.5,
696 ($size - 1) / ($img->get_width - 1), ($size - 1) / ($img->get_height - 1), 761 $size / $img->get_width, $size / $img->get_height,
697 INTERP_HYPER, 255 762 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 255
698 ); 763 );
699 } 764 }
700 } 765 }
701 766
702 push @$$c, [$base->render_pixmap_and_mask (128)]; 767 push @$$c, $base;
703 } 768 }
704 } 769 }
705 770
706 @{$$c->[$rand % @$$c]}; 771 $$c->[$rand % @$$c];
772}
773
774sub pixbuf_text {
775 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
776
777 my @c = grep $_,
778 map $::font[$colour][$::fontmap{$_}],
779 split //, $text;
780
781 if (@c) {
782 my $spacing = $height * 0.1;
783 my $s = $height / List::Util::max map $_->get_height, @c;
784 my $W = List::Util::sum map $_->get_width, @c;
785
786 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
787 $y -= $height * 0.5;
788
789 for (@c) {
790 my $w = $_->get_width * $s;
791 $_->composite ($pixbuf,
792 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s,
793 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
794
795 $x += $w + $spacing;
796 }
797 }
798}
799
800my $black_pb;
801
802sub pixbuf_rect {
803 my ($pb, $x1, $y1, $x2, $y2) = @_;
804 # we fake lines by... an unspeakable method :/
805 unless ($black_pb) {
806 $black_pb = new_pixbuf 1, 1, 0, 0;
807 $black_pb->put_pixels ("\x44\x11\x11", 0, 0);
808 }
809
810 $black_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, 1, 1, INTERP_NEAREST, 192);
707} 811}
708 812
709sub repaint_board { 813sub repaint_board {
710 my ($self) = @_; 814 my ($self) = @_;
711 my $canvas = $self->{canvas}; 815 my $canvas = $self->{canvas};
816 my $expose_area = undef;
712 817
713 %cache = (); 818 return $expose_area unless $self->{board};
714 819
715 my ($w, $h) = @{$canvas->allocation}[2,3]; 820 my ($w, $h) = @{$canvas->allocation}[2,3];
716 821
717 my $s = $w > $h ? $h : $w; 822 my $s = $w > $h ? $h : $w;
718 823
719 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s]; 824 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
720 825
721 my $pixmap = $self->{pixmap} = new Gtk::Gdk::Pixmap $self->{canvas}->window, $s, $s; 826 my $size = $self->{size};
722 827
723 { 828 my $border = int ($s / ($size + 3) * 0.5);
829 my $s2 = $s - $border * 2;
830 my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0);
831 my $ofs = int ($edge / 2);
832
833 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
834
835 my $pixbuf;
836
837 my $oldboard;
838
839 if ($self->{background}) {
840 if ($oldboard = $self->{board_shown}) {
841 $pixbuf = $self->{pixbuf};
842 } else {
843 $pixbuf = $self->{background}->copy;
844 $expose_area = [0, 0, $s, $s];
845 }
846 } else {
847 $expose_area = [0, 0, $s, $s];
848
724 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); 849 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
725 850
726 my $bg = $s < $bw && $s < $bh ? $::board_img : scale_pixbuf $::board_img, $s, $s, INTERP_TILES; 851 if ($s < $bw && $s < $bh) {
727 $bg->render_to_drawable( 852 $pixbuf = new_pixbuf $s, $s, $::config->{conserve_memory} ? 0 : 1, 0;
728 $pixmap, $self->{canvas}->style->white_gc, 853 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
729 0, 0, 0, 0, $s, $s, 854 } else {
730 0, 0, 0 855 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
731 ); 856 }
732 }
733 857
734 my $gc = Gtk::Gdk::GC->new ($pixmap);
735
736 $gc->rgb_gc_set_foreground($line_colour);
737 $gc->set_line_attributes (int ($s / 300) + 1, 'solid', 'projecting', 'miter');
738
739 my $size = $self->{size};
740 my $border = int ($s / $size); 858 my $linew = int ($s / 25 / $size);
741 my $s2 = $s - $border * 2;
742 my $edge = int ($s2 / $size) | 1;
743 my $ofs = int ($edge / 2);
744 859
745 my $font = label_font $ofs;
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) { 860 for my $i (1 .. $size) {
751 $pixmap->draw_line ($gc, $k[$i], $k[1], $k[$i], $k[$size]); 861 pixbuf_rect $pixbuf, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew;
752 $pixmap->draw_line ($gc, $k[1], $k[$i], $k[$size], $k[$i]); 862 pixbuf_rect $pixbuf, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew;
753 863
754 center_text $pixmap, $font, $gc, $k[$i], ($ofs +$border) / 2, $a; 864 # 38 max, but we allow a bit more
755 center_text $pixmap, $font, $gc, $k[$i], $s2 + $border + $ofs / 2, $a; 865 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
756 center_text $pixmap, $font, $gc, ($ofs + $border) / 2, $k[$i], $i; 866 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];
757 center_text $pixmap, $font, $gc, $s2 + $border + $ofs / 2, $k[$i], $i;
758 867
868 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
869 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
870 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
871 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
872
759 $a++; 873 $a++;
760 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 874 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
875 }
876
877 unless ($::config->{conserve_memory}) {
878 $self->{background} = $pixbuf;
879 $pixbuf = $pixbuf->copy;
880 }
761 } 881 }
882
883 $self->{pixbuf} = $pixbuf;
762 884
763 # hoshi-points(!)#d# 885 # hoshi-points(!)#d#
764 # caching of empty board gfx(!)#d# 886 # caching of empty board gfx(!)#d#
765 887
766 if ($self->{board}) { 888 for my $x (1 .. $size) {
767 for my $x (1 .. $size) { 889 for my $y (1 .. $size) {
768 for my $y (1 .. $size) { 890 my $rand = ($x ^ $y ^ 0x5555);
769 my $yk = $s2 * $x / $size - $ofs + $border; 891
892 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
893
894 if ($::config->{randomize}) {
895 $dx += ($rand % 7) - 3;
896 $dy += ($rand / 3 % 7) - 3;
897 }
898
899 my $shadow = $edge * 0.05;
900 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
901
770 my $mark = $self->{board}{board}[$x-1][$y-1]; 902 my $mark = $self->{board}{board}[$x-1][$y-1];
903 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
771 904
905 if ($oldboard && $old != $mark) {
906 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
907 $expose_area = $expose_area
908 ? Gtk::Gdk::Rectangle->union ($expose_area, $area)
909 : $area;
910 }
911
772 if ($mark) { 912 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 ); 913 my $pb = $self->create_stack($mark, $edge, $rand);
775 914
776 $gc->set_clip_mask ($bm); 915 $pb->composite ($pixbuf, @$area,
777 $gc->set_clip_origin ($dx, $dy); 916 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
778 $pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge); 917
918 # labels are handled here because they are quite rare
919 if ($mark & MARK_LABEL) {
920 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
921
922 if ($white) {
923 pixbuf_text $pixbuf, 0,
924 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
925 $self->{board}{label}[$x-1][$y-1];
926 }
927 pixbuf_text $pixbuf, $white,
928 $k[$x], $k[$y], $ofs * 0.7,
929 $self->{board}{label}[$x-1][$y-1];
779 } 930 }
931
932 # old pixmap&mask-way. that was fast ;(
933 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
934
935 #$gc->set_clip_mask ($bm);
936 #$gc->set_clip_origin ($dx, $dy);
937 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
780 } 938 }
781 } 939 }
782 } 940 }
941
942 $self->{board_shown} = Storable::dclone $self->{board};
943 #d# save
944 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
945
946 $expose_area;
947}
948
949sub expose {
950 my ($self, $area) = @_;
951
952 if ($area && $self->{pixbuf}) {
953 my ($x, $y, $w, $h) = @$area;
954 my ($ox, $oy, $s) = @{$self->{offsets}};
955
956 $self->{pixbuf}->render_to_drawable ($self->{canvas}->window, $self->{canvas}->style->white_gc,
957 $x, $y, $x + $ox, $y + $oy, $w, $h);
958 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
959 $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
960
961 #$self->{canvas}->window->draw_pixmap (
962 # $self->{canvas}->style->white_gc,
963 # $self->{pixmap},
964 # $x - $ox, $y - $oy, $x, $y, $w, $h,
965 #);
966 }
967}
968
969sub expose_event {
970 my ($widget, $self, $event) = @_;
971
972 $self->{pixbuf} or return;
973
974 my $area = $event->{area};
975 my ($ox, $oy, $s) = @{$self->{offsets}};
976
977 $self->expose (Gtk::Gdk::Rectangle->intersect (
978 [$area->[0] - $ox, $area->[1] - $oy, $area->[2], $area->[3]],
979 [0, 0, $s, $s],
980 ));
981
982 1;
783} 983}
784 984
785sub event_update_tree { 985sub event_update_tree {
786 my ($self) = @_; 986 my ($self) = @_;
787 987
788 $self->{board} = new KGS::Game::Board $self->{size}; 988 $self->{path} = $self->get_path;
789 $self->{board}->interpret_path ($self->get_path); 989
990 my $move = @{$self->{path}};
790 991
791 $self->repaint_board; 992 $self->{moveadj}->upper($move);
792 993
793 # force a redraw (not perfect(?)) 994 if ($self->{moveadj}->value >= $move - 1 || !$self->{moveadj}->value) {
794 expose_event $self->{canvas}, $self, { area => $self->{canvas}->allocation }; 995 $self->{moveadj}->value ($move);
996 $self->{moveadj}->value_changed;
997 }
998}
795 999
796 $self->{text}->backward_delete($self->{text}->get_length); 1000sub event_part {
797 $self->{text}->insert(undef, undef, undef, $self->{board}{comment}.PApp::Util::dumpval([$self->{board}{time},$self->{board}{captures}])); 1001 my ($self) = @_;
1002 $self->SUPER::event_part;
1003 (delete $self->{window})->destroy; # hmm.. why does this keep the object alive? puzzling.. ahh.. the callbacks ;)
1004 delete $self->{room}{game}{$self->{channel}};
1005}
1006
1007sub event_move {
1008 my ($self, $pass) = @_;
1009 ::play_sound 1, $pass ? "pass" : "move";
1010}
1011
1012sub DESTROY {#d#
1013 warn "DESTROY(@_)\n";#d#
798} 1014}
799 1015
8001; 10161;
801 1017
802 1018

Diff Legend

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