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

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.13 by pcg, Sat May 31 17:28:52 2003 UTC vs.
Revision 1.20 by pcg, Sun Jun 1 06:07:12 2003 UTC

… …
5 5
6use base KGS::Listener::Game; 6use base KGS::Listener::Game;
7use base KGS::Game; 7use base KGS::Game;
8 8
9use base gtk::widget; 9use base gtk::widget;
10
11use POSIX qw(ceil);
10 12
11sub new { 13sub new {
12 my $self = shift; 14 my $self = shift;
13 $self = $self->SUPER::new(@_); 15 $self = $self->SUPER::new(@_);
14 16
… …
48 $self->{moveadj}->signal_connect (value_changed => sub { 50 $self->{moveadj}->signal_connect (value_changed => sub {
49 return unless $self->{path}; 51 return unless $self->{path};
50 52
51 my $move = int (@{$self->{path}} * $_[0]->get_value); 53 my $move = int (@{$self->{path}} * $_[0]->get_value);
52 54
55 $self->{board_label}->set_text ("Move $move");
56
53 $self->{board} = new KGS::Game::Board $self->{size}; 57 $self->{board} = new KGS::Game::Board $self->{size};
54 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 58 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
55 59
56 $self->redraw ($self->repaint_board); 60 $self->redraw ($self->repaint_board);
57 61
58 $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment}); 62 $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
59 }); 63 });
60 } 64 }
61 65
62 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); 66 $vbox->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
67 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
68 $self->{board_label} = $aspect_frame->get_label_widget;
69
70 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
71 $self->{canvas}->double_buffered (0);
63 72
64 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 73 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
65 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 74 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
66 75
67 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); 76 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0);
… …
69 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 78 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
70 79
71 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 80 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
72 $sw->set_policy("automatic", "always"); 81 $sw->set_policy("automatic", "always");
73 82
74 $sw->add(($self->{userlist} = new gtk::userlist)->widget); 83 $sw->add(($self->{userlist} = new userlist)->widget);
75 84
76 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 85 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
77 86
78 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0); 87 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
79 $sw->set_policy("never", "always"); 88 $sw->set_policy("never", "always");
… …
89 98
90 $self; 99 $self;
91} 100}
92 101
93sub event_update_users { 102sub event_update_users {
94 my ($self) = @_; 103 my ($self, $add, $update, $remove) = @_;
95 104
96 $self->{userlist}->update($self->{users}); 105 $self->{userlist}->update ($add, $update, $remove);
97} 106}
98 107
99sub join { 108sub join {
100 my ($self) = @_; 109 my ($self) = @_;
101 $self->SUPER::join; 110 $self->SUPER::join;
… …
124 my ($widget, $event, $self) = @_; 133 my ($widget, $event, $self) = @_;
125 134
126 $self->{pixbuf} or return; 135 $self->{pixbuf} or return;
127 136
128 my $area = $event->area; 137 my $area = $event->area;
129 my ($ox, $oy, $s) = @{$self->{offsets}};
130 138
131 $self->redraw ( 139 $self->redraw ($area);
132 (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height)
133 ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s)
134 );
135 140
136 0; 141 0;
137} 142}
138 143
139# something Gtk2 fixed 144# something Gtk2 fixed
… …
176 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 181 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
177 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; 182 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
178 183
179 # zeroeth the shadow 184 # zeroeth the shadow
180 if ($mark & (MARK_B | MARK_W)) { 185 if ($mark & (MARK_B | MARK_W)) {
181 $::black_img[0]->composite ( 186 $::shadow_img->composite (
182 $base, $shadow, $shadow, $size, $size, $shadow, $shadow, 187 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
183 $size / $stone->get_width, $size / $stone->get_height, 188 $size / $stone->get_width, $size / $stone->get_height,
184 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 189 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
185 ); 190 );
186 } 191 }
187 192
… …
204 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 209 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
205 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 210 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
206 my ($mask, $img) = @$_; 211 my ($mask, $img) = @$_;
207 if ($mark & $mask) { 212 if ($mark & $mask) {
208 $img->composite ( 213 $img->composite (
209 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4) x2, 214 $base, (ceil ($size / 4)) x2, (ceil ($size / 2)) x2, (ceil ($size / 4)) x2,
210 $size / $img->get_width / 2, $size / $img->get_height / 2, 215 $size / $img->get_width / 2, $size / $img->get_height / 2,
211 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 216 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
212 ); 217 );
213 } 218 }
214 } 219 }
215 220
216 # and lastly any markers 221 # and lastly any markers
… …
251 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; 256 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
252 $y -= $height * 0.5; 257 $y -= $height * 0.5;
253 258
254 for (@c) { 259 for (@c) {
255 my $w = $_->get_width * $s; 260 my $w = $_->get_width * $s;
261 # +2 == don't fight the rounding
256 $_->composite ($pixbuf, 262 $_->composite ($pixbuf,
257 $x, $y, $w+1, $height+1, $x, $y, $s, $s, 263 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
258 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 264 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
259 265
260 $x += $w + $spacing; 266 $x += $w + $spacing;
261 } 267 }
262 } 268 }
… …
276 my $expose_area = undef; 282 my $expose_area = undef;
277 283
278 return $expose_area unless $self->{board}; 284 return $expose_area unless $self->{board};
279 285
280 my ($w, $h) = ($canvas->allocation->values)[2,3]; 286 my ($w, $h) = ($canvas->allocation->values)[2,3];
287
288 die "FATAL: board aspect ratio != 1" unless $w == $h;
281 289
282 my $s = $w > $h ? $h : $w; 290 my $s = $w;
283 291
284 return unless $s > 128; 292 return unless $s >= 200;
285 293
286 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
287
288 my $size = $self->{size}; 294 my $size = $self->{size};
289 295
296 # we leave enough space for the shadows.. I like smaller stones, and we
297 # do no need to do the nifty recursive screen updates that goban2 does
290 my $border = int ($s / ($size + 3) * 0.5); 298 my $border = int ($s / ($size + 3) * 0.5);
291 my $s2 = $s - $border * 2; 299 my $s2 = $s - $border * 2;
292 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0); 300 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
293 my $ofs = int ($edge / 2); 301 my $ofs = int ($edge / 2);
294 302
… …
419sub redraw { 427sub redraw {
420 my ($self, $area) = @_; 428 my ($self, $area) = @_;
421 429
422 if ($area && $self->{pixbuf}) { 430 if ($area && $self->{pixbuf}) {
423 my ($x, $y, $w, $h) = $area->values; 431 my ($x, $y, $w, $h) = $area->values;
424 my ($ox, $oy, $s) = @{$self->{offsets}};
425 432
426 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, 433 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
427 $x, $y, $x + $ox, $y + $oy, $w, $h, 434 $x, $y, $x, $y, $w, $h,
428 "normal", 0, 0); 435 "normal", 0, 0);
429 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, 436 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
430 $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE; 437 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
431 } 438 }
432} 439}
433 440
434sub event_update_tree { 441sub event_update_tree {
435 my ($self) = @_; 442 my ($self) = @_;

Diff Legend

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