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.17 by pcg, Sun Jun 1 02:39:00 2003 UTC vs.
Revision 1.36 by pcg, Tue Jun 3 07:35:08 2003 UTC

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

Diff Legend

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