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.61 by pcg, Wed Jun 18 01:07:27 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 configure {
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] - 1) / $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 = int (($_[0] - 1) % $interval + 1);
56
57 sprintf "%s/%d [%d]",
58 util::format_time $time,
59 $self->{moves},
60 $time / ($self->{moves} || 1);
61
62 }
63 };
64
65 } else {
66 # none, or unknown
67 $self->{set} = sub { };
68 $self->{format} = sub { "---" }
69 }
70}
71
72sub refresh {
73 my ($self, $timestamp) = @_;
74 my $timer = $self->{time} + $self->{start} - $timestamp;
75
76 # we round the timer value slightly... the protocol isn't exact anyways,
77 # and this gives smoother timers ;)
78 my @format = $self->{format}->(int ($timer + 0.4));
79 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4)));
80
81 $timer - int $timer;
82}
83
84sub set_time {
85 my ($self, $time) = @_;
86
87 # we ignore requests to re-set the time of a running clock.
88 # this is the easiest way to ensure that commentary etc.
89 # doesn't re-set the clock. yes, this is frickle design,
90 # but I think the protocol is to blame here, which gives
91 # very little time information. (cgoban2 also has had quite
92 # a lot of small time update problems...)
93 unless ($self->{timeout}) {
94 $self->{set}->($time->[0], $time->[1]);
95 $self->refresh ($self->{start});
96 }
97}
98
99sub start {
100 my ($self, $when) = @_;
101
102 $self->stop;
103
104 $self->{start} = $when;
105
106 my $timeout; $timeout = sub {
107 my $next = $self->refresh (Time::HiRes::time) * 1000;
108 $next += 1000 if $next < 0;
109 $self->{timeout} = add Glib::Timeout $next, $timeout;
110 0;
111 };
112
113 $timeout->();
114}
115
116sub stop {
117 my ($self) = @_;
118
119 remove Glib::Source delete $self->{timeout} if $self->{timeout};
120}
121
122sub destroy {
123 my ($self) = @_;
124 $self->stop;
125 $self->SUPER::destroy;
126}
127
128package game::userpanel;
129
130use base gtk::widget;
131
132sub new {
133 my $class = shift;
134 my $self = $class->SUPER::new(@_);
135
136 $self->{widget} = new Gtk2::HBox;
137
138 $self->{widget}->add (my $vbox = new Gtk2::VBox);
139
140 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
141 $vbox->add ($self->{info} = new Gtk2::Label "");
142 $vbox->add (($self->{clock} = new game::goclock)->widget);
143
144 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
145
146 $self;
147}
148
149sub configure {
150 my ($self, $user, $rules) = @_;
151
152 if ($self->{name}->get_text ne $user->as_string) {
153 $self->{name}->set_text ($user->as_string);
154
155 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
156 $self->{imagebox}->add (gtk::image_from_data undef);
157 $self->{imagebox}->show_all;
158
159 if ($user->has_pic) {
160 # the big picture...
161 appwin::userpic ($user->{name}, sub {
162 return unless $self->{imagebox};
163 if ($_[0]) {
164 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
165 $self->{imagebox}->add (gtk::image_from_data $_[0]);
166 $self->{imagebox}->show_all;
167 }
168 });
169 }
170 }
171
172 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
173}
174
175sub set_state {
176 my ($self, $captures, $timer, $when) = @_;
177
178 $self->{clock}->stop unless $when;
179 $self->{clock}->set_time ($timer);
180 $self->{clock}->start ($when) if $when;
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
15 $self->listen($self->{conn}); 201 $self->listen($self->{conn});
16 202
17 $self->{window} = new Gtk2::Window 'toplevel'; 203 $self->{window} = new Gtk2::Window 'toplevel';
18 my $title = $self->{channel} ? $self->owner->{name}." ".$self->opponent_string : "Game Window";
19 $self->{window}->set_title("KGS Game $title");
20 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 204 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
21 205
22 $self->{window}->signal_connect(delete_event => sub { 206 $self->{window}->signal_connect(delete_event => sub {
23 if ($self->{joined}) {
24 $self->part; 207 $self->part;
25 } else { 208 $self->destroy;
26 $self->event_part;
27 }
28 1; 209 1;
29 }); 210 });
30 211
31 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 212 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
32 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 213 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
33 214
215 # LEFT PANE
216
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0);
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 # grrr...
39 { 231 {
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 0, 0, 1, 0.01, 0.1, 0; 235 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 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 #Gtk2::Widget->push_visual (Gtk2::Gdk::Rgb->get_visual); #d# gdk_rgb_* not yet implemented(?) 243
63 #Gtk2::Widget->push_colormap (Gtk2::Gdk::Rgb->get_cmap); 244 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
64 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); 245 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
65 #Gtk2::Widget->pop_colormap; 246 $self->{board_label} = $aspect_frame->get_label_widget;
66 #Gtk2::Widget->pop_visual; 247
248 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
249 $self->{canvas}->double_buffered (0);
67 250
68 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
69 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
70 253
254 # RIGHT PANE
255
71 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); 256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
72 $self->{hpane}->set(position_set => 1); 257 $self->{hpane}->set(position_set => 1);
73 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
74 259
75 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
76 $sw->set_policy("automatic", "always"); 261 $sw->set_policy("automatic", "always");
77 262
78 $sw->add(($self->{userlist} = new gtk::userlist)->widget); 263 $sw->add(($self->{userlist} = new userlist)->widget);
79 264
80 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
81 266
82 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0); 267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
83 $sw->set_policy("automatic", "always"); 268 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget);
84 269 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget);
270
85 $sw->add(($self->{text} = new gtk::text)->widget); 271 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0);
86 272
87 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 273 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
88 $self->{entry}->signal_connect(activate => sub { 274 $self->{entry}->signal_connect(activate => sub {
89 my $text = $self->{entry}->get_text; 275 my $text = $self->{entry}->get_text;
90 # add message 276 $self->say($text) if $text =~ /\S/;
91 $self->{entry}->set_text(""); 277 $self->{entry}->set_text("");
92 }); 278 });
93 279
280 $self->event_update_game;
94 $self; 281 $self;
95} 282}
96 283
97sub event_update_users { 284sub event_update_users {
98 my ($self) = @_; 285 my ($self, $add, $update, $remove) = @_;
99 286
100 $self->{userlist}->update($self->{users}); 287 $self->{userlist}->update ($add, $update, $remove);
288
289 my %important;
290 $important{$self->{user1}{name}}++;
291 $important{$self->{user2}{name}}++;
292 $important{$self->{user3}{name}}++;
293
294 if (my @users = grep $important{$_->{name}}, @$add) {
295 $self->{text}->append_text ("\n<header>Joins:</header>");
296 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users;
297 }
298 if (my @users = grep $important{$_->{name}}, @$remove) {
299 $self->{text}->append_text ("\n<header>Parts:</header>");
300 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users;
301 }
302
101} 303}
102 304
103sub join { 305sub join {
104 my ($self) = @_; 306 my ($self) = @_;
307 return if $self->{joined};
308
105 $self->SUPER::join; 309 $self->SUPER::join;
106 310
107 $self->{window}->show_all; 311 $self->{window}->show_all;
108} 312}
109 313
110sub part { 314sub part {
111 my ($self) = @_; 315 my ($self) = @_;
316
112 $self->SUPER::part; 317 $self->SUPER::part;
113 318 $self->destroy;
114 $self->{window}->hide;
115} 319}
116 320
117sub configure_event { 321sub configure_event {
118 my ($widget, $event, $self) = @_; 322 my ($widget, $event, $self) = @_;
119 delete $self->{stack}; 323 delete $self->{stack};
120 delete $self->{pixbuf}; 324 delete $self->{pixbuf};
121 delete $self->{board_shown}; 325 delete $self->{board_shown};
122 delete $self->{background}; 326 delete $self->{background};
123 $self->repaint_board; 327 $self->repaint_board;
124 1; 328 0;
329}
330
331sub expose_event {
332 my ($widget, $event, $self) = @_;
333
334 $self->{pixbuf} or return;
335
336 $self->redraw ($event->area->values);
337
338 0;
125} 339}
126 340
127# something Gtk2 fixed 341# something Gtk2 fixed
128sub INTERP_NEAREST (){ 'nearest' } 342sub INTERP_NEAREST (){ 'nearest' }
129sub INTERP_TILES (){ 'tiles' } 343sub INTERP_TILES (){ 'tiles' }
164 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 378 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
165 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; 379 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
166 380
167 # zeroeth the shadow 381 # zeroeth the shadow
168 if ($mark & (MARK_B | MARK_W)) { 382 if ($mark & (MARK_B | MARK_W)) {
383 # the -0.5's are a mystery to me
169 $::black_img[0]->composite ( 384 $::shadow_img->composite (
170 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, 385 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
171 $size / $stone->get_width, $size / $stone->get_height, 386 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
172 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 128 387 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
173 ); 388 );
174 } 389 }
175 390
176 # first the big stones (handicap stones different for effect) 391 # first the big stones (handicap stones could be different)
177 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 392 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
178 [MARK_W, $mark & MARK_MOVE ? 255 : 192], 393 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
179 [MARK_GRAY_B, 128], 394 [MARK_GRAY_B, 128],
180 [MARK_GRAY_W, 128]) { 395 [MARK_GRAY_W, 128]) {
181 my ($mask, $alpha) = @$_; 396 my ($mask, $alpha) = @$_;
182 if ($mark & $mask) { 397 if ($mark & $mask) {
183 $stone->composite ( 398 $stone->composite (
184 $base, 0, 0, $size, $size, -0.5, -0.5, 399 $base, 0, 0, $size, $size, 0, 0,
185 $size / $stone->get_width, $size / $stone->get_height, 400 $size / $stone->get_width, $size / $stone->get_height,
186 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha 401 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
187 ); 402 );
188 } 403 }
189 } 404 }
190 405
191 # then the samll stones 406 # then the small stones
192 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 407 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
193 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 408 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
194 my ($mask, $img) = @$_; 409 my ($mask, $img) = @$_;
195 if ($mark & $mask) { 410 if ($mark & $mask) {
196 $img->composite ( 411 $img->composite (
197 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2, 412 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
198 $size / $img->get_width / 2, $size / $img->get_height / 2, 413 $size / $img->get_width / 2, $size / $img->get_height / 2,
199 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 414 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
200 ); 415 );
201 } 416 }
202 } 417 }
203 418
204 # and lastly any markers 419 # and lastly any markers
208 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 423 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
209 [MARK_SQUARE, $::square_img[$dark_bg]]) { 424 [MARK_SQUARE, $::square_img[$dark_bg]]) {
210 my ($mask, $img) = @$_; 425 my ($mask, $img) = @$_;
211 if ($mark & $mask) { 426 if ($mark & $mask) {
212 $img->composite ( 427 $img->composite (
213 $base, 0, 0, $size, $size, -0.5, -0.5, 428 $base, 0, 0, $size, $size, 0, 0,
214 $size / $img->get_width, $size / $img->get_height, 429 $size / $img->get_width, $size / $img->get_height,
215 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255 430 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
216 ); 431 );
217 } 432 }
218 } 433 }
219 434
220 push @$$c, $base; 435 push @$$c, $base;
239 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; 454 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
240 $y -= $height * 0.5; 455 $y -= $height * 0.5;
241 456
242 for (@c) { 457 for (@c) {
243 my $w = $_->get_width * $s; 458 my $w = $_->get_width * $s;
459 # +2 == don't fight the rounding
244 $_->composite ($pixbuf, 460 $_->composite ($pixbuf,
245 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, 461 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
246 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 462 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
247 463
248 $x += $w + $spacing; 464 $x += $w + $spacing;
249 } 465 }
250 } 466 }
259} 475}
260 476
261sub repaint_board { 477sub repaint_board {
262 my ($self) = @_; 478 my ($self) = @_;
263 my $canvas = $self->{canvas}; 479 my $canvas = $self->{canvas};
264 my $expose_area = undef;
265 480
266 return $expose_area unless $self->{board}; 481 return unless $self->{board};
267 482
268 my ($w, $h) = ($canvas->allocation->values)[2,3]; 483 my ($w, $h) = ($canvas->allocation->values)[2,3];
269
270 my $s = $w > $h ? $h : $w;
271
272 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
273 484
485 die "FATAL: board aspect ratio != 1" unless $w == $h;
486
487 my $s = $w;
488
489 return unless $s >= 200;
490
274 my $size = $self->{size}; 491 my $size = $self->{size};
275 492
493 # we leave enough space for the shadows.. I like smaller stones, and we
494 # do no need to do the nifty recursive screen updates that goban2 does
276 my $border = int ($s / ($size + 3) * 0.5); 495 my $border = int ($s / ($size + 3) * 0.5);
277 my $s2 = $s - $border * 2; 496 my $s2 = $s - $border * 2;
278 my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0); 497 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
279 my $ofs = int ($edge / 2); 498 my $ofs = int ($edge / 2);
280 499
281 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; 500 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
282 501
283 my $pixbuf; 502 my $pixbuf;
287 if ($self->{background}) { 506 if ($self->{background}) {
288 if ($oldboard = $self->{board_shown}) { 507 if ($oldboard = $self->{board_shown}) {
289 $pixbuf = $self->{pixbuf}; 508 $pixbuf = $self->{pixbuf};
290 } else { 509 } else {
291 $pixbuf = $self->{background}->copy; 510 $pixbuf = $self->{background}->copy;
292 $expose_area = [0, 0, $s, $s]; 511 $self->{canvas}->queue_draw_area (0, 0, $s, $s);
293 } 512 }
294 } else { 513 } else {
295 $expose_area = [0, 0, $s, $s]; 514 $self->{canvas}->queue_draw_area (0, 0, $s, $s);
296 515
297 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); 516 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
298 517
299 if ($s < $bw && $s < $bh) { 518 if ($s < $bw && $s < $bh) {
300 $pixbuf = new_pixbuf $s, $s, 0; 519 $pixbuf = new_pixbuf $s, $s, 0;
301 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 520 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
302 } else { 521 } else {
303 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; 522 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
304 } 523 }
305 524
306 my $linew = int ($s / 25 / $size); 525 my $linew = int ($s / 40 / $size);
307 526
308 # ornamental border... we have time to waste :/ 527 # ornamental border... we have time to waste :/
309 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255; 528 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
310 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255; 529 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
311 pixbuf_rect $pixbuf,0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255; 530 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; 531 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
313 532
314 for my $i (1 .. $size) { 533 for my $i (1 .. $size) {
315 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192; 534 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; 535 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
317 536
326 545
327 $a++; 546 $a++;
328 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 547 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
329 } 548 }
330 549
550 # hoshi points
551 my $hoshi = sub {
552 my ($x, $y) = @_;
553 my $hs = int ($edge / 4) | 1;
554 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
555
556 # we use the shadow mask... not perfect, but I want to finish this
557 $::shadow_img->composite ($pixbuf,
558 $x, $y, $hs + 1, $hs + 1, $x, $y,
559 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
560 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
561 };
562
563 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
564 $hoshi->($h1, $h1);
565 $hoshi->($size - $h1 + 1, $h1);
566 $hoshi->($h1, $size - $h1 + 1);
567 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
568
569 if ($size % 2) { # on odd boards, also the remaining 5
570 my $h2 = ($size + 1) / 2;
571 if ($size > 10) {
572 $hoshi->($h1, $h2);
573 $hoshi->($size - $h1 + 1, $h2);
574 $hoshi->($h2, $size - $h1 + 1);
575 $hoshi->($h2, $h1);
576 }
577 # the tengen
578 $hoshi->($h2, $h2);
579 }
580
331 unless ($::config->{conserve_memory}) { 581 unless ($::config->{conserve_memory} > 1) {
332 $self->{background} = $pixbuf; 582 $self->{background} = $pixbuf;
333 $pixbuf = $pixbuf->copy; 583 $pixbuf = $pixbuf->copy;
334 } 584 }
335 } 585 }
336 586
337 $self->{pixbuf} = $pixbuf; 587 $self->{pixbuf} = $pixbuf;
338
339 # hoshi-points(!)#d#
340 # caching of empty board gfx(!)#d#
341 588
342 for my $x (1 .. $size) { 589 for my $x (1 .. $size) {
343 for my $y (1 .. $size) { 590 for my $y (1 .. $size) {
344 my $rand = ($x ^ $y ^ 0x5555); 591 my $rand = ($x ^ $y ^ 0x5555);
345 592
358 605
359 if ($oldboard) { 606 if ($oldboard) {
360 next if $old == $mark; # no change 607 next if $old == $mark; # no change
361 608
362 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy); 609 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
363 $expose_area = $expose_area
364 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
365 : new Gtk2::Gdk::Rectangle @$area;
366 } 610 }
367 611
368 if ($mark) { 612 if ($mark) {
369 my $pb = $self->create_stack($mark, $edge, $rand); 613 my $pb = $self->create_stack($mark, $edge, $rand);
370 614
382 } 626 }
383 pixbuf_text $pixbuf, $white, 627 pixbuf_text $pixbuf, $white,
384 $k[$x], $k[$y], $ofs * 0.7, 628 $k[$x], $k[$y], $ofs * 0.7,
385 $self->{board}{label}[$x-1][$y-1]; 629 $self->{board}{label}[$x-1][$y-1];
386 } 630 }
387 631 }
388 # old pixmap&mask-way. that was fast ;(
389 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
390 632
391 #$gc->set_clip_mask ($bm); 633 if ($oldboard) {
392 #$gc->set_clip_origin ($dx, $dy); 634 $self->redraw (@$area);
393 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
394 } 635 }
395 } 636 }
396 } 637 }
397 638
398 $self->{board_shown} = Storable::dclone $self->{board}; 639 $self->{board_shown} = Storable::dclone $self->{board};
399 #d# save
400 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
401
402 $expose_area;
403} 640}
404 641
405sub redraw { 642sub redraw {
406 my ($self, $area) = @_; 643 my ($self, $x, $y, $w, $h) = @_;
407 644
408 if ($area && $self->{pixbuf}) { 645 if ($self->{pixbuf}) {
409 my ($x, $y, $w, $h) = $area->values;
410 my ($ox, $oy, $s) = @{$self->{offsets}};
411
412 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, 646 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
413 $x, $y, $x + $ox, $y + $oy, $w, $h, 647 $x, $y, $x, $y, $w, $h,
414 "normal", 0, 0); 648 "normal", 0, 0);
415 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, 649 $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; 650 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
417 } 651 }
418} 652}
419 653
420sub expose_event { 654sub update_board {
421 my ($widget, $event, $self) = @_; 655 my ($self) = @_;
656 return unless $self->{path};
422 657
423 $self->{pixbuf} or return; 658 my $move = int $self->{moveadj}->get_value;
424 659
425 my $area = $event->area; 660 my $running = $move == @{$self->{path}};
426 my ($ox, $oy, $s) = @{$self->{offsets}};
427 661
428 $self->redraw ( 662 $self->{board_label}->set_text ("Move " . ($move - 1));
429 (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height) 663
430 ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s) 664 $self->{board} = new KGS::Game::Board $self->{size};
665 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
666
667 for my $colour (WHITE, BLACK) {
668 $self->{userpanel}[$colour]->set_state (
669 $self->{board}{captures}[$colour],
670 $self->{board}{timer}[$colour],
671 ($running && $self->{lastmove_colour} == !$colour)
672 ? $self->{lastmove_time} : 0
431 ); 673 );
674 }
432 675
433 1; 676 $self->repaint_board;
434} 677}
435 678
436sub event_update_tree { 679sub event_update_tree {
437 my ($self) = @_; 680 my ($self) = @_;
438 681
439 $self->{path} = $self->get_path; 682 $self->{path} = $self->get_path;
440 683
684 if ($self->{moveadj}) {
685 my $upper = $self->{moveadj}->upper;
686 my $pos = $self->{moveadj}->get_value;
687 my $move = scalar @{$self->{path}};
688
689 $self->{moveadj}->upper ($move);
690
691 $self->{moveadj}->changed;
692 if ($pos == $upper) {
693 $self->{moveadj}->value ($move);
441 $self->{moveadj}->value_changed (); 694 $self->{moveadj}->value_changed;
695 }
696 }
697}
698
699sub event_update_comments {
700 my ($self, $node, $comment, $newnode) = @_;
701 $self->SUPER::event_update_comments($node, $comment, $newnode);
702
703 my $text;
704
705 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
706 if $newnode;
707
708 for (split /\n/, $comment) {
709 $text .= "\n";
710 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
711 $text .= "<user>" . (util::toxml $1) . "</user>:";
712 }
713
714 # coords only for 19x19 so far
715 $_ = util::toxml $_;
716 s{
717 (
718 \b
719 (?:[bw])?
720 [, ]{0,2}
721 [a-hj-t] # valid for upto 19x19
722 \s?
723 [1-9]?[0-9]
724 \b
725 )
726 }{
727 "<coord>$1</coord>";
728 }sgexi;
729
730 $text .= $_;
731 }
732
733 $self->{text}->append_text ($text);
734}
735
736sub event_join {
737 my ($self) = @_;
738 $self->SUPER::event_join;
442} 739}
443 740
444sub event_part { 741sub event_part {
445 my ($self) = @_; 742 my ($self) = @_;
446 $self->SUPER::event_part; 743 $self->SUPER::event_part;
447 delete $appwin::gamelist->{game}{$self->{channel}};
448 $self->destroy; 744 $self->destroy;
449} 745}
450 746
451sub event_move { 747sub event_move {
452 my ($self, $pass) = @_; 748 my ($self, $pass) = @_;
453 sound::play 1, $pass ? "pass" : "move"; 749 sound::play 1, $pass ? "pass" : "move";
454} 750}
455 751
752sub event_update_game {
753 my ($self) = @_;
754 $self->SUPER::event_update_game;
755
756 my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window";
757 $self->{window}->set_title("KGS Game $title");
758 $self->{title}->set_text ($title);
759
760 $self->{user}[BLACK] = $self->{user1};
761 $self->{user}[WHITE] = $self->{user2};
762
763 # show board
764
765 $self->{left}->remove ($_) for $self->{left}->get_children;
766 if ($self->is_valid) {
767 $self->{left}->add ($self->{boardbox});
768 (delete $self->{challenge})->destroy if $self->{challenge};
769 } else {
770 $self->{left}->add ($self->{challenge}->widget);
771 }
772 $self->{left}->show_all;
773
774 # view text
775
776 my @ga;
777 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
778 . " (" . (util::toxml $gameopt{$self->option}) . ")";
779 $ga[1] = "\nFlags:";
780 $ga[1] .= " valid" if $self->is_valid;
781 $ga[1] .= " adjourned" if $self->is_adjourned;
782 $ga[1] .= " scored" if $self->is_scored;
783 $ga[1] .= " saved" if $self->is_saved;
784
785 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
786
787 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
788 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
789 if $self->is_valid;
790
791 if ($self->is_valid) {
792 $ga[4] = "\nHandicap: " . $self->{handicap};
793 $ga[5] = "\nKomi: " . $self->{komi};
794 $ga[6] = "\nSize: " . $self->size_string;
795 }
796
797 if ($self->is_scored) {
798 $ga[7] = "\nResult: " . $self->score_string;
799 }
800
801 $text = "\n<infoblock><header>Game Update</header>";
802 for (0..7) {
803 if ($self->{gatext}[$_] ne $ga[$_]) {
804 $text .= $ga[$_];
805 }
806 }
807 $text .= "</infoblock>";
808
809 $self->{gatext} = \@ga;
810
811 $self->{text}->append_text ($text);
812}
813
814sub event_update_rules {
815 my ($self, $rules) = @_;
816
817 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
818 for BLACK, WHITE;
819
820 sound::play 3, "gamestart";
821
822 my $text = "\n<header>Game Rules</header>";
823
824 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
825
826 $text .= "\nTime: ";
827
828 if ($rules->{timesys} == TIMESYS_NONE) {
829 $text .= "UNLIMITED";
830 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
831 $text .= util::format_time $rules->{time};
832 $text .= " ABS";
833 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
834 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
835 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
836 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
837 $text .= util::format_time $rules->{time};
838 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
839 }
840
841 $self->{text}->append_text ("<infoblock>$text</infoblock>");
842}
843
844sub inject_resign_game {
845 my ($self, $msg) = @_;
846
847 sound::play 3, "resign";
848
849 $self->{text}->append_text ("\n<infoblock><header>Resign</header>"
850 . "\n<user>"
851 . (util::toxml $self->{user}[$msg->{player}]->as_string)
852 . "</user> resigned.</infoblock>");
853}
854
855sub inject_final_result {
856 my ($self, $msg) = @_;
857
858 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>"
859 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
860 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
861 . "</infoblock>"
862 );
863}
864
865sub destroy {
866 my ($self) = @_;
867 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
868 for BLACK, WHITE;
869 $self->SUPER::destroy;
870 delete $appwin::gamelist->{game}{$self->{channel}};
871}
872
4561; 8731;
457 874

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines