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.6 by pcg, Sat May 31 14:55:55 2003 UTC vs.
Revision 1.33 by pcg, Mon Jun 2 14:36:10 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 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
148
149 $self;
150}
151
152sub set_rules {
153 my ($self, $rules) = @_;
154
155 if ($self->{name}->get_text ne $rules->{player}[$self->{colour}]) {
156 $self->{name}->set_text ($rules->{player}[$self->{colour}]);
157
158 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
159 $self->{imagebox}->add (gtk::image_from_data undef);
160 $self->{imagebox}->show_all;
161
162 # the big picture...
163 appwin::userpic ($rules->{player}[$self->{colour}], sub {
164 if ($_[0]) {
165 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
166 $self->{imagebox}->add (gtk::image_from_data $_[0]);
167 $self->{imagebox}->show_all;
168 }
169 });
170 }
171
172 $self->{clock}->set_rules (@{$rules->{rules}}{qw(timesys time interval count)});
173}
174
175sub set_state {
176 my ($self, $captures, $timer, $running) = @_;
177
178 $self->{clock}->stop unless $running;
179 $self->{clock}->set_time ($timer);
180 $self->{clock}->start if $running;
181
182 $self->{info}->set_text ("$captures pris.");
183}
184
1package game; 185package game;
2 186
3use KGS::Constants; 187use KGS::Constants;
4use KGS::Game::Board; 188use KGS::Game::Board;
5 189
6use base KGS::Listener::Game; 190use base KGS::Listener::Game;
7use base KGS::Game; 191use base KGS::Game;
8 192
9use base gtk::widget; 193use base gtk::widget;
194
195use POSIX qw(ceil);
10 196
11sub new { 197sub new {
12 my $self = shift; 198 my $self = shift;
13 $self = $self->SUPER::new(@_); 199 $self = $self->SUPER::new(@_);
14 200
… …
18 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window"; 204 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
19 $self->{window}->set_title("KGS Game $title"); 205 $self->{window}->set_title("KGS Game $title");
20 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 206 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
21 207
22 $self->{window}->signal_connect(delete_event => sub { 208 $self->{window}->signal_connect(delete_event => sub {
23 if ($self->{joined}) {
24 $self->part; 209 $self->part;
25 } else { 210 $self->destroy;
26 $self->event_part;
27 }
28 1; 211 1;
29 }); 212 });
30 213
31 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 214 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
32 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 215 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
33 216
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 1);
218
219 $self->{boardbox} = new Gtk2::VBox;
220
34 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
35 222
223 # challenge
224
225 $self->{challenge} = new challenge channel => $self->{channel};
226
227 # board box (aspect/canvas)
228
36 $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 229 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
37 230
38 { 231 {
39 # grrr...
40 $frame->add(my $vbox = new Gtk2::VBox); 232 $frame->add(my $vbox = new Gtk2::VBox);
41 $vbox->add($self->{title} = new Gtk2::Label $title); 233 $vbox->add($self->{title} = new Gtk2::Label $title);
42 234
43 $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.01, 0.1, 0; 235 $self->{moveadj} = new Gtk2::Adjustment 0, 0, 0, 1, 1, 0;
44 236
45 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
46 $scale->set_draw_value (0); 238 $scale->set_draw_value (0);
239 $scale->set_digits (0);
47 240
48 $self->{moveadj}->signal_connect (value_changed => sub { 241 $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 }
61 242 }
62 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); 243
244 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
245 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
246 $self->{board_label} = $aspect_frame->get_label_widget;
247
248 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
249 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
63 250
64 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
65 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
253
254 # RIGHT PANE
66 255
67 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); 256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0);
68 $self->{hpane}->set(position_set => 1); 257 $self->{hpane}->set(position_set => 1);
69 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
70 259
71 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
72 $sw->set_policy("automatic", "always"); 261 $sw->set_policy("automatic", "always");
73 262
74 $sw->add(($self->{userlist} = new gtk::userlist)->widget); 263 $sw->add(($self->{userlist} = new userlist)->widget);
75 264
76 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
266
267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
268 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget);
269 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget);
77 270
78 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
79 $sw->set_policy("automatic", "always");
80
81 $sw->add(($self->{text} = new gtk::text)->widget); 271 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0);
82 272
83 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 273 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
84 $self->{entry}->signal_connect(activate => sub { 274 $self->{entry}->signal_connect(activate => sub {
85 my $text = $self->{entry}->get_text; 275 my $text = $self->{entry}->get_text;
86 # add message 276 $self->say($text) if $text =~ /\S/;
87 $self->{entry}->set_text(""); 277 $self->{entry}->set_text("");
88 }); 278 });
89 279
280 $self->event_update_game;
90 $self; 281 $self;
91} 282}
92 283
93sub event_update_users { 284sub event_update_users {
94 my ($self) = @_; 285 my ($self, $add, $update, $remove) = @_;
95 286
96 $self->{userlist}->update($self->{users}); 287 $self->{userlist}->update ($add, $update, $remove);
97} 288}
98 289
99sub join { 290sub join {
100 my ($self) = @_; 291 my ($self) = @_;
292 return if $self->{joined};
293
101 $self->SUPER::join; 294 $self->SUPER::join;
102 295
103 $self->{window}->show_all; 296 $self->{window}->show_all;
104} 297}
105 298
106sub part { 299sub part {
107 my ($self) = @_; 300 my ($self) = @_;
301
108 $self->SUPER::part; 302 $self->SUPER::part;
109 303 $self->destroy;
110 $self->{window}->hide;
111} 304}
112 305
113sub configure_event { 306sub configure_event {
114 my ($widget, $event, $self) = @_; 307 my ($widget, $event, $self) = @_;
115 delete $self->{stack}; 308 delete $self->{stack};
… …
124 my ($widget, $event, $self) = @_; 317 my ($widget, $event, $self) = @_;
125 318
126 $self->{pixbuf} or return; 319 $self->{pixbuf} or return;
127 320
128 my $area = $event->area; 321 my $area = $event->area;
129 my ($ox, $oy, $s) = @{$self->{offsets}};
130 322
131 $self->redraw ( 323 $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 324
136 0; 325 0;
137} 326}
138 327
139# something Gtk2 fixed 328# something Gtk2 fixed
… …
176 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 365 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
177 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; 366 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
178 367
179 # zeroeth the shadow 368 # zeroeth the shadow
180 if ($mark & (MARK_B | MARK_W)) { 369 if ($mark & (MARK_B | MARK_W)) {
370 # the -0.5's are a mystery to me
181 $::black_img[0]->composite ( 371 $::shadow_img->composite (
182 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, 372 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
183 $size / $stone->get_width, $size / $stone->get_height, 373 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
184 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 128 374 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
185 ); 375 );
186 } 376 }
187 377
188 # first the big stones (handicap stones different for effect) 378 # first the big stones (handicap stones different for effect)
189 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 379 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
… …
191 [MARK_GRAY_B, 128], 381 [MARK_GRAY_B, 128],
192 [MARK_GRAY_W, 128]) { 382 [MARK_GRAY_W, 128]) {
193 my ($mask, $alpha) = @$_; 383 my ($mask, $alpha) = @$_;
194 if ($mark & $mask) { 384 if ($mark & $mask) {
195 $stone->composite ( 385 $stone->composite (
196 $base, 0, 0, $size, $size, -0.5, -0.5, 386 $base, 0, 0, $size, $size, 0, 0,
197 $size / $stone->get_width, $size / $stone->get_height, 387 $size / $stone->get_width, $size / $stone->get_height,
198 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha 388 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
199 ); 389 );
200 } 390 }
201 } 391 }
202 392
203 # then the samll stones 393 # then the small stones
204 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 394 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
205 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 395 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
206 my ($mask, $img) = @$_; 396 my ($mask, $img) = @$_;
207 if ($mark & $mask) { 397 if ($mark & $mask) {
208 $img->composite ( 398 $img->composite (
209 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2, 399 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
210 $size / $img->get_width / 2, $size / $img->get_height / 2, 400 $size / $img->get_width / 2, $size / $img->get_height / 2,
211 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 401 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
212 ); 402 );
213 } 403 }
214 } 404 }
215 405
216 # and lastly any markers 406 # and lastly any markers
… …
220 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 410 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
221 [MARK_SQUARE, $::square_img[$dark_bg]]) { 411 [MARK_SQUARE, $::square_img[$dark_bg]]) {
222 my ($mask, $img) = @$_; 412 my ($mask, $img) = @$_;
223 if ($mark & $mask) { 413 if ($mark & $mask) {
224 $img->composite ( 414 $img->composite (
225 $base, 0, 0, $size, $size, -0.5, -0.5, 415 $base, 0, 0, $size, $size, 0, 0,
226 $size / $img->get_width, $size / $img->get_height, 416 $size / $img->get_width, $size / $img->get_height,
227 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255 417 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
228 ); 418 );
229 } 419 }
230 } 420 }
231 421
232 push @$$c, $base; 422 push @$$c, $base;
… …
251 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; 441 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
252 $y -= $height * 0.5; 442 $y -= $height * 0.5;
253 443
254 for (@c) { 444 for (@c) {
255 my $w = $_->get_width * $s; 445 my $w = $_->get_width * $s;
446 # +2 == don't fight the rounding
256 $_->composite ($pixbuf, 447 $_->composite ($pixbuf,
257 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, 448 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
258 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 449 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
259 450
260 $x += $w + $spacing; 451 $x += $w + $spacing;
261 } 452 }
262 } 453 }
… …
276 my $expose_area = undef; 467 my $expose_area = undef;
277 468
278 return $expose_area unless $self->{board}; 469 return $expose_area unless $self->{board};
279 470
280 my ($w, $h) = ($canvas->allocation->values)[2,3]; 471 my ($w, $h) = ($canvas->allocation->values)[2,3];
472
473 die "FATAL: board aspect ratio != 1" unless $w == $h;
281 474
282 my $s = $w > $h ? $h : $w; 475 my $s = $w;
283 476
284 return unless $s > 128; 477 return unless $s >= 200;
285 478
286 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
287
288 my $size = $self->{size}; 479 my $size = $self->{size};
289 480
481 # we leave enough space for the shadows.. I like smaller stones, and we
482 # do no need to do the nifty recursive screen updates that goban2 does
290 my $border = int ($s / ($size + 3) * 0.5); 483 my $border = int ($s / ($size + 3) * 0.5);
291 my $s2 = $s - $border * 2; 484 my $s2 = $s - $border * 2;
292 my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0); 485 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
293 my $ofs = int ($edge / 2); 486 my $ofs = int ($edge / 2);
294 487
295 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; 488 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
296 489
297 my $pixbuf; 490 my $pixbuf;
… …
315 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 508 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
316 } else { 509 } else {
317 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; 510 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
318 } 511 }
319 512
320 my $linew = int ($s / 25 / $size); 513 my $linew = int ($s / 40 / $size);
321 514
322 # ornamental border... we have time to waste :/ 515 # ornamental border... we have time to waste :/
323 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255; 516 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
324 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255; 517 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
325 pixbuf_rect $pixbuf,0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255; 518 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
326 pixbuf_rect $pixbuf,0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255; 519 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
327 520
328 for my $i (1 .. $size) { 521 for my $i (1 .. $size) {
329 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192; 522 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
330 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192; 523 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
331 524
… …
340 533
341 $a++; 534 $a++;
342 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 535 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
343 } 536 }
344 537
538 # hoshi points
539 my $hoshi = sub {
540 my ($x, $y) = @_;
541 my $hs = int ($edge / 4) | 1;
542 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
543
544 # we use the shadow mask... not perfect, but I want to finish this
545 $::shadow_img->composite ($pixbuf,
546 $x, $y, $hs + 1, $hs + 1, $x, $y,
547 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
548 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
549 };
550
551 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
552 $hoshi->($h1, $h1);
553 $hoshi->($size - $h1 + 1, $h1);
554 $hoshi->($h1, $size - $h1 + 1);
555 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
556
557 if ($size % 2) { # on odd boards, also the remaining 5
558 my $h2 = ($size + 1) / 2;
559 if ($size > 10) {
560 $hoshi->($h1, $h2);
561 $hoshi->($size - $h1 + 1, $h2);
562 $hoshi->($h2, $size - $h1 + 1);
563 $hoshi->($h2, $h1);
564 }
565 # the tengen
566 $hoshi->($h2, $h2);
567 }
568
345 unless ($::config->{conserve_memory}) { 569 unless ($::config->{conserve_memory} > 1) {
346 $self->{background} = $pixbuf; 570 $self->{background} = $pixbuf;
347 $pixbuf = $pixbuf->copy; 571 $pixbuf = $pixbuf->copy;
348 } 572 }
349 } 573 }
350 574
… …
396 } 620 }
397 pixbuf_text $pixbuf, $white, 621 pixbuf_text $pixbuf, $white,
398 $k[$x], $k[$y], $ofs * 0.7, 622 $k[$x], $k[$y], $ofs * 0.7,
399 $self->{board}{label}[$x-1][$y-1]; 623 $self->{board}{label}[$x-1][$y-1];
400 } 624 }
401
402 # old pixmap&mask-way. that was fast ;(
403 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
404
405 #$gc->set_clip_mask ($bm);
406 #$gc->set_clip_origin ($dx, $dy);
407 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
408 } 625 }
409 } 626 }
410 } 627 }
411 628
412 $self->{board_shown} = Storable::dclone $self->{board}; 629 $self->{board_shown} = Storable::dclone $self->{board};
… …
419sub redraw { 636sub redraw {
420 my ($self, $area) = @_; 637 my ($self, $area) = @_;
421 638
422 if ($area && $self->{pixbuf}) { 639 if ($area && $self->{pixbuf}) {
423 my ($x, $y, $w, $h) = $area->values; 640 my ($x, $y, $w, $h) = $area->values;
424 my ($ox, $oy, $s) = @{$self->{offsets}};
425 641
426 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, 642 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
427 $x, $y, $x + $ox, $y + $oy, $w, $h, 643 $x, $y, $x, $y, $w, $h,
428 "normal", 0, 0); 644 "normal", 0, 0);
429 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, 645 $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; 646 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
431 } 647 }
648}
649
650sub update_board {
651 my ($self) = @_;
652 return unless $self->{path};
653
654 my $move = int $self->{moveadj}->get_value;
655
656 my $running = $move == @{$self->{path}};
657
658 $self->{board_label}->set_text ("Move $move");
659
660 $self->{board} = new KGS::Game::Board $self->{size};
661 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
662
663 $self->{userpanel}[WHITE]->set_state ($self->{board}{captures}[WHITE],
664 $self->{board}{timer}[WHITE],
665 $running && $self->{board}{last} == BLACK);
666 $self->{userpanel}[BLACK]->set_state ($self->{board}{captures}[BLACK],
667 $self->{board}{timer}[BLACK],
668 $running && $self->{board}{last} == WHITE);
669
670 $self->redraw ($self->repaint_board);
432} 671}
433 672
434sub event_update_tree { 673sub event_update_tree {
435 my ($self) = @_; 674 my ($self) = @_;
436 675
437 $self->{path} = $self->get_path; 676 $self->{path} = $self->get_path;
438 $self->{moveadj}->value_changed if $self->{moveadj}; 677
678 $self->{userpanel}[WHITE]->set_rules ($self->{path}[0]); # should be onload only
679 $self->{userpanel}[BLACK]->set_rules ($self->{path}[0]); # should be onload only
680
681 if ($self->{moveadj}) {
682 my $upper = $self->{moveadj}->upper;
683 my $pos = $self->{moveadj}->get_value;
684
685 $self->{moveadj}->upper (scalar @{$self->{path}});
686
687 $self->{moveadj}->changed;
688 if ($pos == $upper) {
689 $self->{moveadj}->set_value (scalar @{$self->{path}});
690 } else {
691 $self->{moveadj}->value_changed;
692 }
693 }
694}
695
696sub event_update_comments {
697 my ($self, $node, $comment, $newnode) = @_;
698 $self->SUPER::event_update_comments($node, $comment, $newnode);
699
700 my $text;
701
702 $text .= "\n<header>Move <move>$node->{move}</move>, <header>Node <node>$node->{id}</node></header>"
703 if $newnode;
704
705 for (split /\n/, $comment) {
706 $text .= "\n";
707 if ($_ =~ s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
708 $text .= "<user>" . (util::toxml $1) . "</user>:";
709 }
710 $text .= $_;
711 }
712
713 $self->{text}->append_text ($text);
714}
715
716sub event_join {
717 my ($self) = @_;
718 $self->SUPER::event_join;
439} 719}
440 720
441sub event_part { 721sub event_part {
442 my ($self) = @_; 722 my ($self) = @_;
443 $self->SUPER::event_part; 723 $self->SUPER::event_part;
444 delete $appwin::gamelist->{game}{$self->{channel}};
445 $self->destroy;
446} 724}
447 725
448sub event_move { 726sub event_move {
449 my ($self, $pass) = @_; 727 my ($self, $pass) = @_;
450 sound::play 1, $pass ? "pass" : "move"; 728 sound::play 1, $pass ? "pass" : "move";
451} 729}
452 730
731sub event_update_game {
732 my ($self) = @_;
733 $self->SUPER::event_update_game;
734 warn "GAME UPDATE ".join (":", %$self);
735 warn "SAVED ".$self->is_saved;
736 warn "SCORED ".$self->is_scored;
737 warn "ADJ ".$self->is_adjourned;
738 warn "VALID ".$self->is_valid;
739 warn "MOVES ".$self->moves;
740 warn "TYPE ".$self->type;
741
742 $self->{left}->remove ($_) for $self->{left}->get_children;
743 if ($self->is_valid) {
744 $self->{left}->add ($self->{boardbox});
745 (delete $self->{challenge})->destroy if $self->{challenge};
746 } else {
747 $self->{left}->add ($self->{challenge}->widget);
748 }
749 $self->{left}->show_all;
750}
751
752sub destroy {
753 my ($self) = @_;
754 (delete $self->{userpanel}[WHITE])->destroy if $self->{userpanel}[WHITE];
755 (delete $self->{userpanel}[BLACK])->destroy if $self->{userpanel}[BLACK];
756 $self->SUPER::destroy;
757 delete $appwin::gamelist->{game}{$self->{channel}};
758}
759
4531; 7601;
454 761

Diff Legend

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