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.15 by pcg, Sun Jun 1 02:30:00 2003 UTC vs.
Revision 1.37 by pcg, Tue Jun 3 13:47:46 2003 UTC

1use utf8;
2
3package game::goclock;
4
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked.
7
8use Time::HiRes ();
9
10use KGS::Constants;
11
12use base gtk::widget;
13
14sub new {
15 my $class = shift;
16 my $self = $class->SUPER::new(@_);
17
18 $self->{widget} = new Gtk2::Label;
19
20 $self->{set} = sub { };
21 $self->{format} = sub { "ERROR" };
22
23 $self;
24}
25
26sub set_rules {
27 my ($self, $timesys, $main, $interval, $count) = @_;
28
29 if ($timesys == TIMESYS_ABSOLUTE) {
30 $self->{set} = sub { $self->{time} = $_[0] };
31 $self->{format} = sub { util::format_time $_[0] };
32
33 } elsif ($timesys == TIMESYS_BYO_YOMI) {
34 my $low = $interval * $count;
35
36 $self->{set} = sub { $self->{time} = $_[0] };
37
38 $self->{format} = sub {
39 if ($_[0] > $low) {
40 util::format_time $_[0] - $low;
41 } else {
42 sprintf "%s (%d)",
43 util::format_time int (($_[0] - 1) % $interval + 1),
44 $_[0] / $interval;
45 }
46 };
47
48 } elsif ($timesys == TIMESYS_CANADIAN) {
49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
50
51 $self->{format} = sub {
52 if (!$self->{moves}) {
53 util::format_time $_[0] - $low;
54 } else {
55 my $time = util::format_time int (($_[0] - 1) % $interval + 1),
56 sprintf "%s/%d {%d}",
57 util::format_time $time,
58 $self->{moves},
59 $time / ($self->{moves} || 1);
60
61 }
62 };
63
64 } else {
65 # none, or unknown
66 $self->{set} = sub { };
67 $self->{format} = sub { "---" }
68 }
69}
70
71sub refresh {
72 my ($self, $timestamp) = @_;
73 my $timer = $self->{time} + $self->{start} - $timestamp + 0.5;
74
75 # we round the timer value slightly... the protocol isn't exact anyways,
76 # and this gives smoother timers ;)
77 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4)));
78
79 $timer - int $timer;
80}
81
82sub set_time {
83 my ($self, $time) = @_;
84
85 # we ignore requests to re-set the time of a running clock.
86 # this is the easiest way to ensure that commentary etc.
87 # doesn't re-set the clock. yes, this is frickle design,
88 # but I think the protocol is to blame here, which gives
89 # very little time information. (cgoban2 also has had quite
90 # a lot of small time update problems...)
91 unless ($self->{timeout}) {
92 $self->{set}->($time->[0], $time->[1]);
93 $self->refresh ($self->{start});
94 }
95}
96
97sub start {
98 my ($self, $when) = @_;
99
100 $self->stop;
101
102 $self->{start} = $when;
103
104 my $timeout; $timeout = sub {
105 my $next = $self->refresh (Time::HiRes::time) * 1000;
106 $next += 1000 if $next < 0;
107 $self->{timeout} = add Glib::Timeout $next, $timeout;
108 0;
109 };
110
111 $timeout->();
112}
113
114sub stop {
115 my ($self) = @_;
116
117 remove Glib::Source delete $self->{timeout} if $self->{timeout};
118}
119
120sub destroy {
121 my ($self) = @_;
122 $self->stop;
123 $self->SUPER::destroy;
124}
125
126package game::userpanel;
127
128use base gtk::widget;
129
130sub new {
131 my $class = shift;
132 my $self = $class->SUPER::new(@_);
133
134 $self->{widget} = new Gtk2::HBox;
135
136 $self->{widget}->add (my $vbox = new Gtk2::VBox);
137
138 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
139 $vbox->add ($self->{info} = new Gtk2::Label "");
140 $vbox->add (($self->{clock} = new game::goclock)->widget);
141
142 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
143
144 $self;
145}
146
147sub configure {
148 my ($self, $name, $rules) = @_;
149
150 if ($self->{name}->get_text ne $name) {
151 $self->{name}->set_text ($name);
152
153 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
154 $self->{imagebox}->add (gtk::image_from_data undef);
155 $self->{imagebox}->show_all;
156
157 # the big picture...
158 appwin::userpic ($name, sub {
159 return unless $self->{imagebox};
160 if ($_[0]) {
161 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
162 $self->{imagebox}->add (gtk::image_from_data $_[0]);
163 $self->{imagebox}->show_all;
164 }
165 });
166 }
167
168 $self->{clock}->set_rules (@{$rules}{qw(timesys time interval count)});
169}
170
171sub set_state {
172 my ($self, $captures, $timer, $when) = @_;
173
174 $self->{clock}->stop unless $when;
175 $self->{clock}->set_time ($timer);
176 $self->{clock}->start ($when) if $when;
177
178 $self->{info}->set_text ("$captures pris.");
179}
180
1package game; 181package game;
2 182
3use KGS::Constants; 183use KGS::Constants;
4use KGS::Game::Board; 184use KGS::Game::Board;
5 185
20 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window"; 200 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
21 $self->{window}->set_title("KGS Game $title"); 201 $self->{window}->set_title("KGS Game $title");
22 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 202 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
23 203
24 $self->{window}->signal_connect(delete_event => sub { 204 $self->{window}->signal_connect(delete_event => sub {
25 if ($self->{joined}) {
26 $self->part; 205 $self->part;
27 } else { 206 $self->destroy;
28 $self->event_part;
29 }
30 1; 207 1;
31 }); 208 });
32 209
33 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 210 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
34 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 211 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
35 212
213 # LEFT PANE
214
215 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0);
216
217 $self->{boardbox} = new Gtk2::VBox;
218
36 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 219 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
37 220
221 # challenge
222
223 $self->{challenge} = new challenge channel => $self->{channel};
224
225 # board box (aspect/canvas)
226
38 $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 227 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
39 228
40 { 229 {
41 # grrr...
42 $frame->add(my $vbox = new Gtk2::VBox); 230 $frame->add(my $vbox = new Gtk2::VBox);
43 $vbox->add($self->{title} = new Gtk2::Label $title); 231 $vbox->add($self->{title} = new Gtk2::Label $title);
44 232
45 $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.001, 0.05, 0; 233 $self->{moveadj} = new Gtk2::Adjustment 0, 0, 0, 1, 1, 0;
46 234
47 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 235 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
48 $scale->set_draw_value (0); 236 $scale->set_draw_value (0);
237 $scale->set_digits (0);
49 238
50 $self->{moveadj}->signal_connect (value_changed => sub { 239 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
51 return unless $self->{path};
52
53 my $move = int (@{$self->{path}} * $_[0]->get_value);
54
55 $self->{board} = new KGS::Game::Board $self->{size};
56 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
57
58 $self->redraw ($self->repaint_board);
59
60 $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
61 });
62 }
63 240 }
64 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); 241
242 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
243 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
244 $self->{board_label} = $aspect_frame->get_label_widget;
245
246 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
247 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
65 248
66 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 249 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
67 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 250 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
68 251
252 # RIGHT PANE
253
69 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); 254 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
70 $self->{hpane}->set(position_set => 1); 255 $self->{hpane}->set(position_set => 1);
71 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 256 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
72 257
73 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 258 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
74 $sw->set_policy("automatic", "always"); 259 $sw->set_policy("automatic", "always");
75 260
76 $sw->add(($self->{userlist} = new gtk::userlist)->widget); 261 $sw->add(($self->{userlist} = new userlist)->widget);
77 262
78 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 263 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
264
265 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
266 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget);
267 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget);
79 268
80 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
81 $sw->set_policy("never", "always");
82
83 $sw->add(($self->{text} = new gtk::text)->widget); 269 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0);
84 270
85 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 271 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
86 $self->{entry}->signal_connect(activate => sub { 272 $self->{entry}->signal_connect(activate => sub {
87 my $text = $self->{entry}->get_text; 273 my $text = $self->{entry}->get_text;
88 $self->say($text) if $text =~ /\S/; 274 $self->say($text) if $text =~ /\S/;
89 $self->{entry}->set_text(""); 275 $self->{entry}->set_text("");
90 }); 276 });
91 277
278 $self->event_update_game;
92 $self; 279 $self;
93} 280}
94 281
95sub event_update_users { 282sub event_update_users {
96 my ($self) = @_; 283 my ($self, $add, $update, $remove) = @_;
97 284
98 $self->{userlist}->update($self->{users}); 285 $self->{userlist}->update ($add, $update, $remove);
99} 286}
100 287
101sub join { 288sub join {
102 my ($self) = @_; 289 my ($self) = @_;
290 return if $self->{joined};
291
103 $self->SUPER::join; 292 $self->SUPER::join;
104 293
105 $self->{window}->show_all; 294 $self->{window}->show_all;
106} 295}
107 296
108sub part { 297sub part {
109 my ($self) = @_; 298 my ($self) = @_;
299
110 $self->SUPER::part; 300 $self->SUPER::part;
111 301 $self->destroy;
112 $self->{window}->hide;
113} 302}
114 303
115sub configure_event { 304sub configure_event {
116 my ($widget, $event, $self) = @_; 305 my ($widget, $event, $self) = @_;
117 delete $self->{stack}; 306 delete $self->{stack};
126 my ($widget, $event, $self) = @_; 315 my ($widget, $event, $self) = @_;
127 316
128 $self->{pixbuf} or return; 317 $self->{pixbuf} or return;
129 318
130 my $area = $event->area; 319 my $area = $event->area;
131 my ($ox, $oy, $s) = @{$self->{offsets}};
132 320
133 $self->redraw ( 321 $self->redraw ($area);
134 (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height)
135 ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s)
136 );
137 322
138 0; 323 0;
139} 324}
140 325
141# something Gtk2 fixed 326# something Gtk2 fixed
178 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 363 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
179 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; 364 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
180 365
181 # zeroeth the shadow 366 # zeroeth the shadow
182 if ($mark & (MARK_B | MARK_W)) { 367 if ($mark & (MARK_B | MARK_W)) {
368 # the -0.5's are a mystery to me
183 $::shadow_img->composite ( 369 $::shadow_img->composite (
184 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5, 370 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
185 $size / $stone->get_width, $size / $stone->get_height, 371 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
186 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 372 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
187 ); 373 );
188 } 374 }
189 375
190 # first the big stones (handicap stones different for effect) 376 # first the big stones (handicap stones different for effect)
206 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 392 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
207 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 393 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
208 my ($mask, $img) = @$_; 394 my ($mask, $img) = @$_;
209 if ($mark & $mask) { 395 if ($mark & $mask) {
210 $img->composite ( 396 $img->composite (
211 $base, (ceil ($size / 4)) x2, (ceil ($size / 2)) x2, (ceil ($size / 4)) x2, 397 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
212 $size / $img->get_width / 2, $size / $img->get_height / 2, 398 $size / $img->get_width / 2, $size / $img->get_height / 2,
213 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224 399 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
214 ); 400 );
215 } 401 }
216 } 402 }
222 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 408 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
223 [MARK_SQUARE, $::square_img[$dark_bg]]) { 409 [MARK_SQUARE, $::square_img[$dark_bg]]) {
224 my ($mask, $img) = @$_; 410 my ($mask, $img) = @$_;
225 if ($mark & $mask) { 411 if ($mark & $mask) {
226 $img->composite ( 412 $img->composite (
227 $base, 0, 0, $size, $size, -0.5, -0.5, 413 $base, 0, 0, $size, $size, 0, 0,
228 $size / $img->get_width, $size / $img->get_height, 414 $size / $img->get_width, $size / $img->get_height,
229 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255 415 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
230 ); 416 );
231 } 417 }
232 } 418 }
233 419
234 push @$$c, $base; 420 push @$$c, $base;
253 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; 439 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
254 $y -= $height * 0.5; 440 $y -= $height * 0.5;
255 441
256 for (@c) { 442 for (@c) {
257 my $w = $_->get_width * $s; 443 my $w = $_->get_width * $s;
444 # +2 == don't fight the rounding
258 $_->composite ($pixbuf, 445 $_->composite ($pixbuf,
259 $x, $y, $w+1, $height+1, $x, $y, $s, $s, 446 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
260 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 447 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
261 448
262 $x += $w + $spacing; 449 $x += $w + $spacing;
263 } 450 }
264 } 451 }
278 my $expose_area = undef; 465 my $expose_area = undef;
279 466
280 return $expose_area unless $self->{board}; 467 return $expose_area unless $self->{board};
281 468
282 my ($w, $h) = ($canvas->allocation->values)[2,3]; 469 my ($w, $h) = ($canvas->allocation->values)[2,3];
470
471 die "FATAL: board aspect ratio != 1" unless $w == $h;
283 472
284 my $s = $w > $h ? $h : $w; 473 my $s = $w;
285 474
286 return unless $s > 128; 475 return unless $s >= 200;
287 476
288 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
289
290 my $size = $self->{size}; 477 my $size = $self->{size};
291 478
479 # we leave enough space for the shadows.. I like smaller stones, and we
480 # do no need to do the nifty recursive screen updates that goban2 does
292 my $border = int ($s / ($size + 3) * 0.5); 481 my $border = int ($s / ($size + 3) * 0.5);
293 my $s2 = $s - $border * 2; 482 my $s2 = $s - $border * 2;
294 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0); 483 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
295 my $ofs = int ($edge / 2); 484 my $ofs = int ($edge / 2);
296 485
317 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 506 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
318 } else { 507 } else {
319 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; 508 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
320 } 509 }
321 510
322 my $linew = int ($s / 25 / $size); 511 my $linew = int ($s / 40 / $size);
323 512
324 # ornamental border... we have time to waste :/ 513 # ornamental border... we have time to waste :/
325 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255; 514 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
326 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255; 515 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
327 pixbuf_rect $pixbuf,0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255; 516 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
328 pixbuf_rect $pixbuf,0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255; 517 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
329 518
330 for my $i (1 .. $size) { 519 for my $i (1 .. $size) {
331 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192; 520 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
332 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192; 521 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
333 522
342 531
343 $a++; 532 $a++;
344 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 533 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
345 } 534 }
346 535
536 # hoshi points
537 my $hoshi = sub {
538 my ($x, $y) = @_;
539 my $hs = int ($edge / 4) | 1;
540 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
541
542 # we use the shadow mask... not perfect, but I want to finish this
543 $::shadow_img->composite ($pixbuf,
544 $x, $y, $hs + 1, $hs + 1, $x, $y,
545 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
546 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
547 };
548
549 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
550 $hoshi->($h1, $h1);
551 $hoshi->($size - $h1 + 1, $h1);
552 $hoshi->($h1, $size - $h1 + 1);
553 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
554
555 if ($size % 2) { # on odd boards, also the remaining 5
556 my $h2 = ($size + 1) / 2;
557 if ($size > 10) {
558 $hoshi->($h1, $h2);
559 $hoshi->($size - $h1 + 1, $h2);
560 $hoshi->($h2, $size - $h1 + 1);
561 $hoshi->($h2, $h1);
562 }
563 # the tengen
564 $hoshi->($h2, $h2);
565 }
566
347 unless ($::config->{conserve_memory}) { 567 unless ($::config->{conserve_memory} > 1) {
348 $self->{background} = $pixbuf; 568 $self->{background} = $pixbuf;
349 $pixbuf = $pixbuf->copy; 569 $pixbuf = $pixbuf->copy;
350 } 570 }
351 } 571 }
352 572
398 } 618 }
399 pixbuf_text $pixbuf, $white, 619 pixbuf_text $pixbuf, $white,
400 $k[$x], $k[$y], $ofs * 0.7, 620 $k[$x], $k[$y], $ofs * 0.7,
401 $self->{board}{label}[$x-1][$y-1]; 621 $self->{board}{label}[$x-1][$y-1];
402 } 622 }
403
404 # old pixmap&mask-way. that was fast ;(
405 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
406
407 #$gc->set_clip_mask ($bm);
408 #$gc->set_clip_origin ($dx, $dy);
409 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
410 } 623 }
411 } 624 }
412 } 625 }
413 626
414 $self->{board_shown} = Storable::dclone $self->{board}; 627 $self->{board_shown} = Storable::dclone $self->{board};
421sub redraw { 634sub redraw {
422 my ($self, $area) = @_; 635 my ($self, $area) = @_;
423 636
424 if ($area && $self->{pixbuf}) { 637 if ($area && $self->{pixbuf}) {
425 my ($x, $y, $w, $h) = $area->values; 638 my ($x, $y, $w, $h) = $area->values;
426 my ($ox, $oy, $s) = @{$self->{offsets}};
427 639
428 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, 640 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
429 $x, $y, $x + $ox, $y + $oy, $w, $h, 641 $x, $y, $x, $y, $w, $h,
430 "normal", 0, 0); 642 "normal", 0, 0);
431 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, 643 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
432 $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE; 644 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
433 } 645 }
646}
647
648sub update_board {
649 my ($self) = @_;
650 return unless $self->{path};
651
652 my $move = int $self->{moveadj}->get_value;
653
654 my $running = $move == @{$self->{path}};
655
656 $self->{board_label}->set_text ("Move $move");
657
658 $self->{board} = new KGS::Game::Board $self->{size};
659 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
660
661 for my $colour (WHITE, BLACK) {
662 $self->{userpanel}[$colour]->set_state (
663 $self->{board}{captures}[$colour],
664 $self->{board}{timer}[$colour],
665 ($running && $self->{lastmove_colour} == !$colour)
666 ? $self->{lastmove_time} : 0
667 );
668 }
669
670 $self->redraw ($self->repaint_board);
434} 671}
435 672
436sub event_update_tree { 673sub event_update_tree {
437 my ($self) = @_; 674 my ($self) = @_;
438 675
439 $self->{path} = $self->get_path; 676 $self->{path} = $self->get_path;
440 $self->{moveadj}->value_changed if $self->{moveadj}; 677
678 if ($self->{moveadj}) {
679 my $upper = $self->{moveadj}->upper;
680 my $pos = $self->{moveadj}->get_value;
681
682 $self->{moveadj}->upper (scalar @{$self->{path}});
683
684 $self->{moveadj}->changed;
685 if ($pos == $upper) {
686 $self->{moveadj}->set_value (scalar @{$self->{path}});
687 } else {
688 $self->{moveadj}->value_changed;
689 }
690 }
691}
692
693sub event_update_comments {
694 my ($self, $node, $comment, $newnode) = @_;
695 $self->SUPER::event_update_comments($node, $comment, $newnode);
696
697 my $text;
698
699 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
700 if $newnode;
701
702 for (split /\n/, $comment) {
703 $text .= "\n";
704 if ($_ =~ s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
705 $text .= "<user>" . (util::toxml $1) . "</user>:";
706 }
707 $text .= $_;
708 }
709
710 $self->{text}->append_text ($text);
711}
712
713sub event_join {
714 my ($self) = @_;
715 $self->SUPER::event_join;
441} 716}
442 717
443sub event_part { 718sub event_part {
444 my ($self) = @_; 719 my ($self) = @_;
445 $self->SUPER::event_part; 720 $self->SUPER::event_part;
446 delete $appwin::gamelist->{game}{$self->{channel}};
447 $self->destroy;
448} 721}
449 722
450sub event_move { 723sub event_move {
451 my ($self, $pass) = @_; 724 my ($self, $pass) = @_;
452 sound::play 1, $pass ? "pass" : "move"; 725 sound::play 1, $pass ? "pass" : "move";
453} 726}
454 727
728sub event_update_game {
729 my ($self) = @_;
730 $self->SUPER::event_update_game;
731
732 $self->{user}[BLACK] = $self->{user1};
733 $self->{user}[WHITE] = $self->{user2};
734
735 $text = "\n<header>Game Update</header>";
736
737 $text .= "\nType: " . (util::toxml $gametype{$self->type})
738 . " (" . (util::toxml $gameopt{$self->option}) . ")";
739 $text .= "\nFlags:";
740 $text .= " valid" if $self->is_valid;
741 $text .= " adjourned" if $self->is_adjourned;
742 $text .= " scored" if $self->is_scored;
743 $text .= " saved" if $self->is_saved;
744
745 $text .= "\nWhite: <user>" . (util::toxml $self->{user2}->as_string) . "</user>";
746 $text .= "\nBlack: <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
747 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
748
749 if ($self->is_valid) {
750 $text .= "\nHandicap: " . $self->{handicap};
751 $text .= "\nKomi: " . $self->{komi};
752 $text .= "\nSize: " . $self->size_string;
753 }
754
755 $self->{text}->append_text ($text);
756
757 $self->{left}->remove ($_) for $self->{left}->get_children;
758 if ($self->is_valid) {
759 $self->{left}->add ($self->{boardbox});
760 (delete $self->{challenge})->destroy if $self->{challenge};
761 } else {
762 $self->{left}->add ($self->{challenge}->widget);
763 }
764 $self->{left}->show_all;
765}
766
767sub event_update_rules {
768 my ($self, $rules) = @_;
769
770 $self->{userpanel}[$_]->configure (
771 $self->{user}[$_]->as_string, # OMG.. better use self->user or something!!!
772 ) for BLACK, WHITE;
773
774 my $text = "\n<header>Game Rules</header>";
775
776 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
777
778 if ($rules->{timesys} != TIMESYS_NONE) {
779 # probably subtract interval * count..
780 $text .= "\nTime: "
781 . (util::format_time $rules->{time} - $rules->{interval} * $rules->{count})
782 . " + ";
783
784 $text .= sprintf "%d (%d)", $rules->{interval}, $rules->{count}
785 if $rules->{timesys} == TIMESYS_BYO_YOMI;
786 $text .= sprintf "%d/%d", $rules->{interval}, $rules->{count}
787 if $rules->{timesys} == TIMESYS_CANADIAN;
788
789 $text .= " " . $timesys{$rules->{timesys}};
790 }
791
792 $self->{text}->append_text ($text);
793}
794
795sub destroy {
796 my ($self) = @_;
797 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
798 for BLACK, WHITE;
799 $self->SUPER::destroy;
800 delete $appwin::gamelist->{game}{$self->{channel}};
801}
802
4551; 8031;
456 804

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines