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.57 by pcg, Sat Jun 14 11:53:24 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) if $::config->{conserve_memory};
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 my $area = $event->area;
337
338 $self->redraw ($area);
339
340 0;
125} 341}
126 342
127# something Gtk2 fixed 343# something Gtk2 fixed
128sub INTERP_NEAREST (){ 'nearest' } 344sub INTERP_NEAREST (){ 'nearest' }
129sub INTERP_TILES (){ 'tiles' } 345sub INTERP_TILES (){ 'tiles' }
164 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 380 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
165 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; 381 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
166 382
167 # zeroeth the shadow 383 # zeroeth the shadow
168 if ($mark & (MARK_B | MARK_W)) { 384 if ($mark & (MARK_B | MARK_W)) {
385 # the -0.5's are a mystery to me
169 $::black_img[0]->composite ( 386 $::shadow_img->composite (
170 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, 387 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
171 $size / $stone->get_width, $size / $stone->get_height, 388 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
172 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 128 389 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
173 ); 390 );
174 } 391 }
175 392
176 # first the big stones (handicap stones different for effect) 393 # first the big stones (handicap stones could be different)
177 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 394 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
178 [MARK_W, $mark & MARK_MOVE ? 255 : 192], 395 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
179 [MARK_GRAY_B, 128], 396 [MARK_GRAY_B, 128],
180 [MARK_GRAY_W, 128]) { 397 [MARK_GRAY_W, 128]) {
181 my ($mask, $alpha) = @$_; 398 my ($mask, $alpha) = @$_;
182 if ($mark & $mask) { 399 if ($mark & $mask) {
183 $stone->composite ( 400 $stone->composite (
184 $base, 0, 0, $size, $size, -0.5, -0.5, 401 $base, 0, 0, $size, $size, 0, 0,
185 $size / $stone->get_width, $size / $stone->get_height, 402 $size / $stone->get_width, $size / $stone->get_height,
186 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha 403 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
187 ); 404 );
188 } 405 }
189 } 406 }
190 407
191 # then the samll stones 408 # then the small stones
192 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 409 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
193 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 410 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
194 my ($mask, $img) = @$_; 411 my ($mask, $img) = @$_;
195 if ($mark & $mask) { 412 if ($mark & $mask) {
196 $img->composite ( 413 $img->composite (
197 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2, 414 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
198 $size / $img->get_width / 2, $size / $img->get_height / 2, 415 $size / $img->get_width / 2, $size / $img->get_height / 2,
199 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 416 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
200 ); 417 );
201 } 418 }
202 } 419 }
203 420
204 # and lastly any markers 421 # and lastly any markers
208 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 425 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
209 [MARK_SQUARE, $::square_img[$dark_bg]]) { 426 [MARK_SQUARE, $::square_img[$dark_bg]]) {
210 my ($mask, $img) = @$_; 427 my ($mask, $img) = @$_;
211 if ($mark & $mask) { 428 if ($mark & $mask) {
212 $img->composite ( 429 $img->composite (
213 $base, 0, 0, $size, $size, -0.5, -0.5, 430 $base, 0, 0, $size, $size, 0, 0,
214 $size / $img->get_width, $size / $img->get_height, 431 $size / $img->get_width, $size / $img->get_height,
215 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255 432 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
216 ); 433 );
217 } 434 }
218 } 435 }
219 436
220 push @$$c, $base; 437 push @$$c, $base;
239 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; 456 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
240 $y -= $height * 0.5; 457 $y -= $height * 0.5;
241 458
242 for (@c) { 459 for (@c) {
243 my $w = $_->get_width * $s; 460 my $w = $_->get_width * $s;
461 # +2 == don't fight the rounding
244 $_->composite ($pixbuf, 462 $_->composite ($pixbuf,
245 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, 463 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
246 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 464 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
247 465
248 $x += $w + $spacing; 466 $x += $w + $spacing;
249 } 467 }
250 } 468 }
264 my $expose_area = undef; 482 my $expose_area = undef;
265 483
266 return $expose_area unless $self->{board}; 484 return $expose_area unless $self->{board};
267 485
268 my ($w, $h) = ($canvas->allocation->values)[2,3]; 486 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 487
488 die "FATAL: board aspect ratio != 1" unless $w == $h;
489
490 my $s = $w;
491
492 return unless $s >= 200;
493
274 my $size = $self->{size}; 494 my $size = $self->{size};
275 495
496 # we leave enough space for the shadows.. I like smaller stones, and we
497 # do no need to do the nifty recursive screen updates that goban2 does
276 my $border = int ($s / ($size + 3) * 0.5); 498 my $border = int ($s / ($size + 3) * 0.5);
277 my $s2 = $s - $border * 2; 499 my $s2 = $s - $border * 2;
278 my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0); 500 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
279 my $ofs = int ($edge / 2); 501 my $ofs = int ($edge / 2);
280 502
281 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; 503 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
282 504
283 my $pixbuf; 505 my $pixbuf;
287 if ($self->{background}) { 509 if ($self->{background}) {
288 if ($oldboard = $self->{board_shown}) { 510 if ($oldboard = $self->{board_shown}) {
289 $pixbuf = $self->{pixbuf}; 511 $pixbuf = $self->{pixbuf};
290 } else { 512 } else {
291 $pixbuf = $self->{background}->copy; 513 $pixbuf = $self->{background}->copy;
292 $expose_area = [0, 0, $s, $s]; 514 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
293 } 515 }
294 } else { 516 } else {
295 $expose_area = [0, 0, $s, $s]; 517 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
296 518
297 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); 519 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
298 520
299 if ($s < $bw && $s < $bh) { 521 if ($s < $bw && $s < $bh) {
300 $pixbuf = new_pixbuf $s, $s, 0; 522 $pixbuf = new_pixbuf $s, $s, 0;
301 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 523 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
302 } else { 524 } else {
303 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; 525 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
304 } 526 }
305 527
306 my $linew = int ($s / 25 / $size); 528 my $linew = int ($s / 40 / $size);
307 529
308 # ornamental border... we have time to waste :/ 530 # ornamental border... we have time to waste :/
309 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255; 531 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
310 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255; 532 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
311 pixbuf_rect $pixbuf,0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255; 533 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; 534 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
313 535
314 for my $i (1 .. $size) { 536 for my $i (1 .. $size) {
315 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192; 537 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; 538 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
317 539
326 548
327 $a++; 549 $a++;
328 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 550 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
329 } 551 }
330 552
553 # hoshi points
554 my $hoshi = sub {
555 my ($x, $y) = @_;
556 my $hs = int ($edge / 4) | 1;
557 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
558
559 # we use the shadow mask... not perfect, but I want to finish this
560 $::shadow_img->composite ($pixbuf,
561 $x, $y, $hs + 1, $hs + 1, $x, $y,
562 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
563 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
564 };
565
566 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
567 $hoshi->($h1, $h1);
568 $hoshi->($size - $h1 + 1, $h1);
569 $hoshi->($h1, $size - $h1 + 1);
570 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
571
572 if ($size % 2) { # on odd boards, also the remaining 5
573 my $h2 = ($size + 1) / 2;
574 if ($size > 10) {
575 $hoshi->($h1, $h2);
576 $hoshi->($size - $h1 + 1, $h2);
577 $hoshi->($h2, $size - $h1 + 1);
578 $hoshi->($h2, $h1);
579 }
580 # the tengen
581 $hoshi->($h2, $h2);
582 }
583
331 unless ($::config->{conserve_memory}) { 584 unless ($::config->{conserve_memory} > 1) {
332 $self->{background} = $pixbuf; 585 $self->{background} = $pixbuf;
333 $pixbuf = $pixbuf->copy; 586 $pixbuf = $pixbuf->copy;
334 } 587 }
335 } 588 }
336 589
337 $self->{pixbuf} = $pixbuf; 590 $self->{pixbuf} = $pixbuf;
338
339 # hoshi-points(!)#d#
340 # caching of empty board gfx(!)#d#
341 591
342 for my $x (1 .. $size) { 592 for my $x (1 .. $size) {
343 for my $y (1 .. $size) { 593 for my $y (1 .. $size) {
344 my $rand = ($x ^ $y ^ 0x5555); 594 my $rand = ($x ^ $y ^ 0x5555);
345 595
382 } 632 }
383 pixbuf_text $pixbuf, $white, 633 pixbuf_text $pixbuf, $white,
384 $k[$x], $k[$y], $ofs * 0.7, 634 $k[$x], $k[$y], $ofs * 0.7,
385 $self->{board}{label}[$x-1][$y-1]; 635 $self->{board}{label}[$x-1][$y-1];
386 } 636 }
387
388 # old pixmap&mask-way. that was fast ;(
389 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
390
391 #$gc->set_clip_mask ($bm);
392 #$gc->set_clip_origin ($dx, $dy);
393 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
394 } 637 }
395 } 638 }
396 } 639 }
397 640
398 $self->{board_shown} = Storable::dclone $self->{board}; 641 $self->{board_shown} = Storable::dclone $self->{board};
405sub redraw { 648sub redraw {
406 my ($self, $area) = @_; 649 my ($self, $area) = @_;
407 650
408 if ($area && $self->{pixbuf}) { 651 if ($area && $self->{pixbuf}) {
409 my ($x, $y, $w, $h) = $area->values; 652 my ($x, $y, $w, $h) = $area->values;
410 my ($ox, $oy, $s) = @{$self->{offsets}};
411 653
412 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, 654 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
413 $x, $y, $x + $ox, $y + $oy, $w, $h, 655 $x, $y, $x, $y, $w, $h,
414 "normal", 0, 0); 656 "normal", 0, 0);
415 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, 657 $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; 658 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
417 } 659 }
418} 660}
419 661
420sub expose_event { 662sub update_board {
421 my ($widget, $event, $self) = @_; 663 my ($self) = @_;
664 return unless $self->{path};
422 665
423 $self->{pixbuf} or return; 666 #$self->{update_board_cb} ||= add Glib::Idle sub {
667 my $move = int $self->{moveadj}->get_value;
424 668
425 my $area = $event->area; 669 my $running = $move == @{$self->{path}};
426 my ($ox, $oy, $s) = @{$self->{offsets}};
427 670
428 $self->redraw ( 671 $self->{board_label}->set_text ("Move " . ($move - 1));
429 (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height) 672
430 ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s) 673 $self->{board} = new KGS::Game::Board $self->{size};
674 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
675
676 for my $colour (WHITE, BLACK) {
677 $self->{userpanel}[$colour]->set_state (
678 $self->{board}{captures}[$colour],
679 $self->{board}{timer}[$colour],
680 ($running && $self->{lastmove_colour} == !$colour)
681 ? $self->{lastmove_time} : 0
431 ); 682 );
683 }
432 684
433 1; 685 $self->redraw ($self->repaint_board);
686
687 # delete $self->{update_board_cb};
688 #}
434} 689}
435 690
436sub event_update_tree { 691sub event_update_tree {
437 my ($self) = @_; 692 my ($self) = @_;
438 693
439 $self->{path} = $self->get_path; 694 $self->{path} = $self->get_path;
440 695
696 if ($self->{moveadj}) {
697 my $upper = $self->{moveadj}->upper;
698 my $pos = $self->{moveadj}->get_value;
699 my $move = scalar @{$self->{path}};
700
701 $self->{moveadj}->upper ($move);
702
703 $self->{moveadj}->changed;
704 if ($pos == $upper) {
705 $self->{moveadj}->value ($move);
441 $self->{moveadj}->value_changed (); 706 $self->{moveadj}->value_changed;
707 }
708 }
709}
710
711sub event_update_comments {
712 my ($self, $node, $comment, $newnode) = @_;
713 $self->SUPER::event_update_comments($node, $comment, $newnode);
714
715 my $text;
716
717 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
718 if $newnode;
719
720 for (split /\n/, $comment) {
721 $text .= "\n";
722 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
723 $text .= "<user>" . (util::toxml $1) . "</user>:";
724 }
725
726 # coords only for 19x19 so far
727 $_ = util::toxml $_;
728 s{
729 (
730 \b
731 (?:[bw])?
732 [, ]{0,2}
733 [a-hj-t] # valid for upto 19x19
734 \s?
735 [1-9]?[0-9]
736 \b
737 )
738 }{
739 "<coord>$1</coord>";
740 }sgexi;
741
742 $text .= $_;
743 }
744
745 $self->{text}->append_text ($text);
746}
747
748sub event_join {
749 my ($self) = @_;
750 $self->SUPER::event_join;
442} 751}
443 752
444sub event_part { 753sub event_part {
445 my ($self) = @_; 754 my ($self) = @_;
446 $self->SUPER::event_part; 755 $self->SUPER::event_part;
447 delete $appwin::gamelist->{game}{$self->{channel}};
448 $self->destroy; 756 $self->destroy;
449} 757}
450 758
451sub event_move { 759sub event_move {
452 my ($self, $pass) = @_; 760 my ($self, $pass) = @_;
453 sound::play 1, $pass ? "pass" : "move"; 761 sound::play 1, $pass ? "pass" : "move";
454} 762}
455 763
764sub event_update_game {
765 my ($self) = @_;
766 $self->SUPER::event_update_game;
767
768 my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window";
769 $self->{window}->set_title("KGS Game $title");
770 $self->{title}->set_text ($title);
771
772 $self->{user}[BLACK] = $self->{user1};
773 $self->{user}[WHITE] = $self->{user2};
774
775 # show board
776
777 $self->{left}->remove ($_) for $self->{left}->get_children;
778 if ($self->is_valid) {
779 $self->{left}->add ($self->{boardbox});
780 (delete $self->{challenge})->destroy if $self->{challenge};
781 } else {
782 $self->{left}->add ($self->{challenge}->widget);
783 }
784 $self->{left}->show_all;
785
786 # view text
787
788 my @ga;
789 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
790 . " (" . (util::toxml $gameopt{$self->option}) . ")";
791 $ga[1] = "\nFlags:";
792 $ga[1] .= " valid" if $self->is_valid;
793 $ga[1] .= " adjourned" if $self->is_adjourned;
794 $ga[1] .= " scored" if $self->is_scored;
795 $ga[1] .= " saved" if $self->is_saved;
796
797 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
798
799 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
800 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
801 if $self->is_valid;
802
803 if ($self->is_valid) {
804 $ga[4] = "\nHandicap: " . $self->{handicap};
805 $ga[5] = "\nKomi: " . $self->{komi};
806 $ga[6] = "\nSize: " . $self->size_string;
807 }
808
809 if ($self->is_scored) {
810 $ga[7] = "\nResult: " . $self->score_string;
811 }
812
813 $text = "\n<infoblock><header>Game Update</header>";
814 for (0..7) {
815 if ($self->{gatext}[$_] ne $ga[$_]) {
816 $text .= $ga[$_];
817 }
818 }
819 $text .= "</infoblock>";
820
821 $self->{gatext} = \@ga;
822
823 $self->{text}->append_text ($text);
824}
825
826sub event_update_rules {
827 my ($self, $rules) = @_;
828
829 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
830 for BLACK, WHITE;
831
832 sound::play 3, "gamestart";
833
834 my $text = "\n<header>Game Rules</header>";
835
836 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
837
838 $text .= "\nTime: ";
839
840 if ($rules->{timesys} == TIMESYS_NONE) {
841 $text .= "UNLIMITED";
842 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
843 $text .= util::format_time $rules->{time};
844 $text .= " ABS";
845 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
846 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
847 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
848 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
849 $text .= util::format_time $rules->{time};
850 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
851 }
852
853 $self->{text}->append_text ("<infoblock>$text</infoblock>");
854}
855
856sub inject_resign_game {
857 my ($self, $msg) = @_;
858
859 sound::play 3, "resign";
860
861 $self->{text}->append_text ("\n<infoblock><header>Resign</header>"
862 . "\n<user>"
863 . (util::toxml $self->{user}[$msg->{player}]->as_string)
864 . "</user> resigned.</infoblock>");
865}
866
867sub inject_final_result {
868 my ($self, $msg) = @_;
869
870 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>"
871 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
872 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
873 . "</infoblock>"
874 );
875}
876
877sub destroy {
878 my ($self) = @_;
879 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
880 for BLACK, WHITE;
881 $self->SUPER::destroy;
882 delete $appwin::gamelist->{game}{$self->{channel}};
883}
884
4561; 8851;
457 886

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines