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.4 by pcg, Sat May 31 13:58:31 2003 UTC vs.
Revision 1.29 by pcg, Sun Jun 1 16:51:38 2003 UTC

1package game::goclock;
2
3use Time::HiRes ();
4
5use KGS::Constants;
6
7use base gtk::widget;
8
9sub new {
10 my $class = shift;
11 my $self = $class->SUPER::new(@_);
12
13 $self->{widget} = new Gtk2::Label;
14
15 $self->{set} = sub { };
16 $self->{format} = sub { "ERROR" };
17
18 $self;
19}
20
21sub append_text {
22 my ($self, $text) = @_;
23
24 $self->{buffer}->insert ($self->{buffer}->get_end_iter, $text);
25}
26
27sub format_time {
28 my ($time) = @_;
29
30 $time > 60*60
31 ? sprintf "%d:%02d:%02d", $time / (60 * 60), $time / 60 % 60, $time % 60
32 : sprintf "%d:%02d", $time / 60 % 60, $time % 60;
33}
34
35sub set_rules {
36 my ($self, $timesys, $main, $interval, $count) = @_;
37
38 if ($timesys == TIMESYS_ABSOLUTE) {
39 $self->{set} = sub { $self->{time} = $_[0] };
40 $self->{format} = sub { format_time $_[0] };
41
42 } elsif ($timesys == TIMESYS_BYO_YOMI) {
43 my $low = $interval * $count;
44
45 $self->{set} = sub { $self->{time} = $_[0] };
46
47 $self->{format} = sub {
48 if ($_[0] > $low) {
49 format_time $_[0] - $low;
50 } else {
51 sprintf "%s (%d)", (format_time int ($_[0] % $interval) || $interval), $_[0] / $interval;
52 }
53 };
54
55 } elsif ($timesys == TIMESYS_CANADIAN) {
56 my $low = $interval;
57
58 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
59
60 $self->{format} = sub {
61 if ($_[0] > $low) {
62 format_time $_[0] - $low;
63 } else {
64 sprintf "%s / %d", (format_time int($_[0] % $interval) || $interval), $self->{moves};
65 }
66 };
67
68 } else {
69 # none, or unknown
70 $self->{set} = sub { };
71 $self->{format} = sub { "---" }
72 }
73}
74
75sub refresh {
76 my ($self, $timestamp) = @_;
77 my $timer = $self->{time} + $self->{start} - $timestamp;
78 $self->{widget}->set_text ($self->{format}->($timer));
79
80 $timer - int $timer;
81}
82
83sub set_time {
84 my ($self, $time) = @_;
85
86 # we ignore requests to re-set the time of a running clock.
87 # this is the easiest way to ensure that commentary etc.
88 # doesn't re-set the clock. yes, this is frickle design,
89 # but I think the protoocl is to blame here, which gives
90 # very little time information. (cgoban2 also has had quite
91 # a lot of small time update problems...)
92 unless ($self->{timeout}) {
93 $self->{set}->($time->[0], $time->[1]);
94 $self->refresh ($self->{start});
95 }
96}
97
98sub start {
99 my ($self) = @_;
100
101 return if $self->{timeout};
102
103 # this is correct, since we assume the last message triggered a start
104 $self->{start} = $KGS::Protocol::NOW;
105
106 my $timeout; $timeout = sub {
107 # -100 means we run the timer a bit earlier to avoid 10.99 => 10s roundings.
108 # we "could" cheat by precalculating the time, but I feel uneasy about both
109 # ways to cheat.
110 my $next = int ($self->refresh (Time::HiRes::time) * 1000) - 100;
111 $next += 1000 if $next < 0;
112 $self->{timeout} = add Glib::Timeout $next, $timeout;
113 0;
114 };
115
116 $timeout->();
117}
118
119sub stop {
120 my ($self) = @_;
121
122 remove Glib::Source delete $self->{timeout} if $self->{timeout};
123}
124
125sub destroy {
126 my ($self) = @_;
127 $self->stop;
128 $self->SUPER::destroy;
129}
130
131package game::userpanel;
132
133use base gtk::widget;
134
135sub new {
136 my $class = shift;
137 my $self = $class->SUPER::new(@_);
138
139 $self->{widget} = new Gtk2::HBox;
140
141 $self->{widget}->add (my $vbox = new Gtk2::VBox);
142
143 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
144 $vbox->add ($self->{info} = new Gtk2::Label "");
145 $vbox->add (($self->{clock} = new game::goclock)->widget);
146
147 $self;
148}
149
150sub set_rules {
151 my ($self, $rules) = @_;
152
153 if ($self->{name}->get_text ne $rules->{player}[$self->{colour}]) {
154 $self->{name}->set_text ($rules->{player}[$self->{colour}]);
155
156 # the big picture...
157 appwin::userpic ($rules->{player}[$self->{colour}], sub {
158 $self->{widget}->add (gtk::image_from_data $_[0]) if $_[0];
159 $self->{widget}->show_all;
160 # undef => show sth. funny
161 });
162 }
163
164 $self->{clock}->set_rules (@{$rules->{rules}}{qw(timesys time interval count)});
165}
166
167sub set_state {
168 my ($self, $captures, $timer, $running) = @_;
169
170 $self->{clock}->stop unless $running;
171 $self->{clock}->set_time ($timer);
172 $self->{clock}->start if $running;
173
174 $self->{info}->set_text ("$captures pris.");
175}
176
1package game; 177package game;
2 178
3use KGS::Constants; 179use KGS::Constants;
4use KGS::Game::Board; 180use KGS::Game::Board;
5 181
6use base KGS::Listener::Game; 182use base KGS::Listener::Game;
7use base KGS::Game; 183use base KGS::Game;
8 184
9use base gtk::widget; 185use base gtk::widget;
186
187use POSIX qw(ceil);
10 188
11sub new { 189sub new {
12 my $self = shift; 190 my $self = shift;
13 $self = $self->SUPER::new(@_); 191 $self = $self->SUPER::new(@_);
14 192
15 $self->listen($self->{conn}); 193 $self->listen($self->{conn});
16 194
17 $self->{window} = new Gtk2::Window 'toplevel'; 195 $self->{window} = new Gtk2::Window 'toplevel';
18 my $title = $self->{channel} ? $self->owner->{name}." ".$self->opponent_string : "Game Window"; 196 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
19 $self->{window}->set_title("KGS Game $title"); 197 $self->{window}->set_title("KGS Game $title");
20 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 198 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
21 199
22 $self->{window}->signal_connect(delete_event => sub { 200 $self->{window}->signal_connect(delete_event => sub {
23 if ($self->{joined}) {
24 $self->part; 201 $self->part;
25 } else { 202 $self->destroy;
26 $self->event_part;
27 }
28 1; 203 1;
29 }); 204 });
30 205
31 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 206 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
32 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 207 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
33 208
34 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 209 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
35 210
36 $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 211 $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
37 212
38 # grrr...
39 { 213 {
214 # grrr...
40 $frame->add(my $vbox = new Gtk2::VBox); 215 $frame->add(my $vbox = new Gtk2::VBox);
41 $vbox->add($self->{title} = new Gtk2::Label $title); 216 $vbox->add($self->{title} = new Gtk2::Label $title);
42 217
43 $self->{moveadj} = new Gtk2::Adjustment 0, 0, 1, 0.01, 0.1, 0; 218 $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.001, 0.05, 0;
44 219
45 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 220 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
46 $scale->set_draw_value (0); 221 $scale->set_draw_value (0);
47 222
48 $self->{moveadj}->signal_connect (value_changed => sub { 223 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
49 return unless $self->{path};
50
51 my $move = int (@{$self->{path}} * $_[0]->get_value);
52
53 $self->{board} = new KGS::Game::Board $self->{size};
54 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
55
56 $self->redraw ($self->repaint_board);
57
58 $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
59 });
60 } 224 }
61 225
62 #Gtk2::Widget->push_visual (Gtk2::Gdk::Rgb->get_visual); #d# gdk_rgb_* not yet implemented(?) 226 $vbox->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
63 #Gtk2::Widget->push_colormap (Gtk2::Gdk::Rgb->get_cmap); 227 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
64 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); 228 $self->{board_label} = $aspect_frame->get_label_widget;
65 #Gtk2::Widget->pop_colormap; 229
66 #Gtk2::Widget->pop_visual; 230 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
231 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
67 232
68 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 233 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
69 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 234 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
235
236 # RIGHT PANE
70 237
71 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); 238 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0);
72 $self->{hpane}->set(position_set => 1); 239 $self->{hpane}->set(position_set => 1);
73 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 240 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
74 241
75 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 242 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
76 $sw->set_policy("automatic", "always"); 243 $sw->set_policy("automatic", "always");
77 244
78 $sw->add(($self->{userlist} = new gtk::userlist)->widget); 245 $sw->add(($self->{userlist} = new userlist)->widget);
79 246
80 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 247 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
248
249 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
250 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget);
251 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget);
81 252
82 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0); 253 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
83 $sw->set_policy("automatic", "always"); 254 $sw->set_policy("never", "always");
84 255
85 $sw->add(($self->{text} = new gtk::text)->widget); 256 $sw->add(($self->{text} = new gtk::text)->widget);
86 257
87 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 258 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
88 $self->{entry}->signal_connect(activate => sub { 259 $self->{entry}->signal_connect(activate => sub {
89 my $text = $self->{entry}->get_text; 260 my $text = $self->{entry}->get_text;
90 # add message 261 $self->say($text) if $text =~ /\S/;
91 $self->{entry}->set_text(""); 262 $self->{entry}->set_text("");
92 }); 263 });
93 264
94 $self; 265 $self;
95} 266}
96 267
97sub event_update_users { 268sub event_update_users {
98 my ($self) = @_; 269 my ($self, $add, $update, $remove) = @_;
99 270
100 $self->{userlist}->update($self->{users}); 271 $self->{userlist}->update ($add, $update, $remove);
101} 272}
102 273
103sub join { 274sub join {
104 my ($self) = @_; 275 my ($self) = @_;
276 return if $self->{joined};
277
105 $self->SUPER::join; 278 $self->SUPER::join;
106 279
107 $self->{window}->show_all; 280 $self->{window}->show_all;
108} 281}
109 282
110sub part { 283sub part {
111 my ($self) = @_; 284 my ($self) = @_;
285
112 $self->SUPER::part; 286 $self->SUPER::part;
113 287 $self->destroy;
114 $self->{window}->hide;
115} 288}
116 289
117sub configure_event { 290sub configure_event {
118 my ($widget, $event, $self) = @_; 291 my ($widget, $event, $self) = @_;
119 delete $self->{stack}; 292 delete $self->{stack};
120 delete $self->{pixbuf}; 293 delete $self->{pixbuf};
121 delete $self->{board_shown}; 294 delete $self->{board_shown};
122 delete $self->{background}; 295 delete $self->{background};
123 $self->repaint_board; 296 $self->repaint_board;
124 1; 297 0;
298}
299
300sub expose_event {
301 my ($widget, $event, $self) = @_;
302
303 $self->{pixbuf} or return;
304
305 my $area = $event->area;
306
307 $self->redraw ($area);
308
309 0;
125} 310}
126 311
127# something Gtk2 fixed 312# something Gtk2 fixed
128sub INTERP_NEAREST (){ 'nearest' } 313sub INTERP_NEAREST (){ 'nearest' }
129sub INTERP_TILES (){ 'tiles' } 314sub INTERP_TILES (){ 'tiles' }
… …
164 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 349 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
165 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; 350 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
166 351
167 # zeroeth the shadow 352 # zeroeth the shadow
168 if ($mark & (MARK_B | MARK_W)) { 353 if ($mark & (MARK_B | MARK_W)) {
354 # the -0.5's are a mystery to me
169 $::black_img[0]->composite ( 355 $::shadow_img->composite (
170 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, 356 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
171 $size / $stone->get_width, $size / $stone->get_height, 357 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
172 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 128 358 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
173 ); 359 );
174 } 360 }
175 361
176 # first the big stones (handicap stones different for effect) 362 # first the big stones (handicap stones different for effect)
177 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 363 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
… …
179 [MARK_GRAY_B, 128], 365 [MARK_GRAY_B, 128],
180 [MARK_GRAY_W, 128]) { 366 [MARK_GRAY_W, 128]) {
181 my ($mask, $alpha) = @$_; 367 my ($mask, $alpha) = @$_;
182 if ($mark & $mask) { 368 if ($mark & $mask) {
183 $stone->composite ( 369 $stone->composite (
184 $base, 0, 0, $size, $size, -0.5, -0.5, 370 $base, 0, 0, $size, $size, 0, 0,
185 $size / $stone->get_width, $size / $stone->get_height, 371 $size / $stone->get_width, $size / $stone->get_height,
186 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha 372 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
187 ); 373 );
188 } 374 }
189 } 375 }
190 376
191 # then the samll stones 377 # then the small stones
192 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 378 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
193 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 379 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
194 my ($mask, $img) = @$_; 380 my ($mask, $img) = @$_;
195 if ($mark & $mask) { 381 if ($mark & $mask) {
196 $img->composite ( 382 $img->composite (
197 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2, 383 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
198 $size / $img->get_width / 2, $size / $img->get_height / 2, 384 $size / $img->get_width / 2, $size / $img->get_height / 2,
199 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 385 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
200 ); 386 );
201 } 387 }
202 } 388 }
203 389
204 # and lastly any markers 390 # and lastly any markers
… …
208 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 394 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
209 [MARK_SQUARE, $::square_img[$dark_bg]]) { 395 [MARK_SQUARE, $::square_img[$dark_bg]]) {
210 my ($mask, $img) = @$_; 396 my ($mask, $img) = @$_;
211 if ($mark & $mask) { 397 if ($mark & $mask) {
212 $img->composite ( 398 $img->composite (
213 $base, 0, 0, $size, $size, -0.5, -0.5, 399 $base, 0, 0, $size, $size, 0, 0,
214 $size / $img->get_width, $size / $img->get_height, 400 $size / $img->get_width, $size / $img->get_height,
215 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255 401 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
216 ); 402 );
217 } 403 }
218 } 404 }
219 405
220 push @$$c, $base; 406 push @$$c, $base;
… …
239 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; 425 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
240 $y -= $height * 0.5; 426 $y -= $height * 0.5;
241 427
242 for (@c) { 428 for (@c) {
243 my $w = $_->get_width * $s; 429 my $w = $_->get_width * $s;
430 # +2 == don't fight the rounding
244 $_->composite ($pixbuf, 431 $_->composite ($pixbuf,
245 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, 432 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
246 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 433 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
247 434
248 $x += $w + $spacing; 435 $x += $w + $spacing;
249 } 436 }
250 } 437 }
… …
264 my $expose_area = undef; 451 my $expose_area = undef;
265 452
266 return $expose_area unless $self->{board}; 453 return $expose_area unless $self->{board};
267 454
268 my ($w, $h) = ($canvas->allocation->values)[2,3]; 455 my ($w, $h) = ($canvas->allocation->values)[2,3];
456
457 die "FATAL: board aspect ratio != 1" unless $w == $h;
269 458
270 my $s = $w > $h ? $h : $w; 459 my $s = $w;
460
461 return unless $s >= 200;
271 462
272 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
273
274 my $size = $self->{size}; 463 my $size = $self->{size};
275 464
465 # we leave enough space for the shadows.. I like smaller stones, and we
466 # do no need to do the nifty recursive screen updates that goban2 does
276 my $border = int ($s / ($size + 3) * 0.5); 467 my $border = int ($s / ($size + 3) * 0.5);
277 my $s2 = $s - $border * 2; 468 my $s2 = $s - $border * 2;
278 my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0); 469 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
279 my $ofs = int ($edge / 2); 470 my $ofs = int ($edge / 2);
280 471
281 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; 472 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
282 473
283 my $pixbuf; 474 my $pixbuf;
… …
287 if ($self->{background}) { 478 if ($self->{background}) {
288 if ($oldboard = $self->{board_shown}) { 479 if ($oldboard = $self->{board_shown}) {
289 $pixbuf = $self->{pixbuf}; 480 $pixbuf = $self->{pixbuf};
290 } else { 481 } else {
291 $pixbuf = $self->{background}->copy; 482 $pixbuf = $self->{background}->copy;
292 $expose_area = [0, 0, $s, $s]; 483 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
293 } 484 }
294 } else { 485 } else {
295 $expose_area = [0, 0, $s, $s]; 486 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
296 487
297 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); 488 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
298 489
299 if ($s < $bw && $s < $bh) { 490 if ($s < $bw && $s < $bh) {
300 $pixbuf = new_pixbuf $s, $s, 0; 491 $pixbuf = new_pixbuf $s, $s, 0;
301 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 492 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
302 } else { 493 } else {
303 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; 494 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
304 } 495 }
305 496
306 my $linew = int ($s / 25 / $size); 497 my $linew = int ($s / 40 / $size);
307 498
308 # ornamental border... we have time to waste :/ 499 # ornamental border... we have time to waste :/
309 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255; 500 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
310 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255; 501 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
311 pixbuf_rect $pixbuf,0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255; 502 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
312 pixbuf_rect $pixbuf,0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255; 503 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
313 504
314 for my $i (1 .. $size) { 505 for my $i (1 .. $size) {
315 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192; 506 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
316 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192; 507 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
317 508
… …
326 517
327 $a++; 518 $a++;
328 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 519 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
329 } 520 }
330 521
522 # hoshi points
523 my $hoshi = sub {
524 my ($x, $y) = @_;
525 my $hs = int ($edge / 4) | 1;
526 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
527
528 # we use the shadow mask... not perfect, but I want to finish this
529 $::shadow_img->composite ($pixbuf,
530 $x, $y, $hs + 1, $hs + 1, $x, $y,
531 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
532 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
533 };
534
535 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
536 $hoshi->($h1, $h1);
537 $hoshi->($size - $h1 + 1, $h1);
538 $hoshi->($h1, $size - $h1 + 1);
539 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
540
541 if ($size % 2) { # on odd boards, also the remaining 5
542 my $h2 = ($size + 1) / 2;
543 if ($size > 10) {
544 $hoshi->($h1, $h2);
545 $hoshi->($size - $h1 + 1, $h2);
546 $hoshi->($h2, $size - $h1 + 1);
547 $hoshi->($h2, $h1);
548 }
549 # the tengen
550 $hoshi->($h2, $h2);
551 }
552
331 unless ($::config->{conserve_memory}) { 553 unless ($::config->{conserve_memory} > 1) {
332 $self->{background} = $pixbuf; 554 $self->{background} = $pixbuf;
333 $pixbuf = $pixbuf->copy; 555 $pixbuf = $pixbuf->copy;
334 } 556 }
335 } 557 }
336 558
… …
382 } 604 }
383 pixbuf_text $pixbuf, $white, 605 pixbuf_text $pixbuf, $white,
384 $k[$x], $k[$y], $ofs * 0.7, 606 $k[$x], $k[$y], $ofs * 0.7,
385 $self->{board}{label}[$x-1][$y-1]; 607 $self->{board}{label}[$x-1][$y-1];
386 } 608 }
387
388 # old pixmap&mask-way. that was fast ;(
389 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
390
391 #$gc->set_clip_mask ($bm);
392 #$gc->set_clip_origin ($dx, $dy);
393 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
394 } 609 }
395 } 610 }
396 } 611 }
397 612
398 $self->{board_shown} = Storable::dclone $self->{board}; 613 $self->{board_shown} = Storable::dclone $self->{board};
… …
405sub redraw { 620sub redraw {
406 my ($self, $area) = @_; 621 my ($self, $area) = @_;
407 622
408 if ($area && $self->{pixbuf}) { 623 if ($area && $self->{pixbuf}) {
409 my ($x, $y, $w, $h) = $area->values; 624 my ($x, $y, $w, $h) = $area->values;
410 my ($ox, $oy, $s) = @{$self->{offsets}};
411 625
412 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, 626 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
413 $x, $y, $x + $ox, $y + $oy, $w, $h, 627 $x, $y, $x, $y, $w, $h,
414 "normal", 0, 0); 628 "normal", 0, 0);
415 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, 629 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
416 $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE; 630 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
417 } 631 }
418} 632}
419 633
420sub expose_event { 634sub update_board {
421 my ($widget, $event, $self) = @_; 635 my ($self) = @_;
636 return unless $self->{path};
422 637
423 $self->{pixbuf} or return; 638 my $move = int (@{$self->{path}} * $self->{moveadj}->get_value);
424 639
425 my $area = $event->area; 640 my $running = $move == @{$self->{path}};
426 my ($ox, $oy, $s) = @{$self->{offsets}};
427 641
428 $self->redraw ( 642 $self->{board_label}->set_text ("Move $move");
429 (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height)
430 ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s)
431 );
432 643
433 1; 644 $self->{board} = new KGS::Game::Board $self->{size};
645 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
646
647 $self->{userpanel}[WHITE]->set_state ($self->{board}{captures}[WHITE],
648 $self->{board}{timer}[WHITE],
649 $running && $self->{board}{last} == BLACK);
650 $self->{userpanel}[BLACK]->set_state ($self->{board}{captures}[BLACK],
651 $self->{board}{timer}[BLACK],
652 $running && $self->{board}{last} == WHITE);
653
654 $self->redraw ($self->repaint_board);
434} 655}
435 656
436sub event_update_tree { 657sub event_update_tree {
437 my ($self) = @_; 658 my ($self) = @_;
438 659
439 $self->{path} = $self->get_path; 660 $self->{path} = $self->get_path;
661 $self->{userpanel}[WHITE]->set_rules ($self->{path}[0]); # should be onload only
662 $self->{userpanel}[BLACK]->set_rules ($self->{path}[0]); # should be onload only
440 663
441 $self->{moveadj}->value_changed (); 664 $self->{moveadj}->value_changed if $self->{moveadj};
665}
666
667sub event_update_comments {
668 my ($self, $node, $comment, $newnode) = @_;
669 $self->SUPER::event_update_comments($node, $comment, $newnode);
670
671 $self->{text}->append_text ("\nMove <move>$node->{move}</move>, <header>Node <node>$node->{id}</node></header>")
672 if $newnode;
673
674 $self->{text}->append_text ("\n" . util::toxml $comment);
442} 675}
443 676
444sub event_part { 677sub event_part {
445 my ($self) = @_; 678 my ($self) = @_;
446 $self->SUPER::event_part; 679 $self->SUPER::event_part;
447 delete $appwin::gamelist->{game}{$self->{channel}};
448 $self->destroy;
449} 680}
450 681
451sub event_move { 682sub event_move {
452 my ($self, $pass) = @_; 683 my ($self, $pass) = @_;
453 sound::play 1, $pass ? "pass" : "move"; 684 sound::play 1, $pass ? "pass" : "move";
454} 685}
455 686
687sub event_update_game {
688 my ($self) = @_;
689 $self->SUPER::event_update_game;
690 warn "UPDATE GAME";#d#
691}
692
693sub destroy {
694 my ($self) = @_;
695 (delete $self->{userpanel}[WHITE])->destroy if $self->{userpanel}[WHITE];
696 (delete $self->{userpanel}[BLACK])->destroy if $self->{userpanel}[BLACK];
697 $self->SUPER::destroy;
698 delete $appwin::gamelist->{game}{$self->{channel}};
699}
700
4561; 7011;
457 702

Diff Legend

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