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.38 by pcg, Tue Jun 3 15:08:41 2003 UTC vs.
Revision 1.95 by pcg, Fri May 28 23:19:59 2004 UTC

1use utf8; 1use utf8;
2
3use Scalar::Util ();
2 4
3package game::goclock; 5package game::goclock;
4 6
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock 7# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked. 8# is completely borked.
7 9
8use Time::HiRes (); 10use Time::HiRes ();
9 11
10use KGS::Constants; 12use KGS::Constants;
11 13
12use base gtk::widget; 14use Glib::Object::Subclass
15 Gtk2::Label;
13 16
14sub new { 17sub INIT_INSTANCE {
15 my $class = shift; 18 my $self = shift;
16 my $self = $class->SUPER::new(@_);
17 19
18 $self->{widget} = new Gtk2::Label; 20 $self->signal_connect (destroy => sub { $_[0]->stop });
19 21
20 $self->{set} = sub { }; 22 $self->{set} = sub { };
21 $self->{format} = sub { "ERROR" }; 23 $self->{format} = sub { "???" };
22
23 $self;
24} 24}
25 25
26sub configure { 26sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_; 27 my ($self, $timesys, $main, $interval, $count) = @_;
28 28
39 if ($_[0] > $low) { 39 if ($_[0] > $low) {
40 util::format_time $_[0] - $low; 40 util::format_time $_[0] - $low;
41 } else { 41 } else {
42 sprintf "%s (%d)", 42 sprintf "%s (%d)",
43 util::format_time int (($_[0] - 1) % $interval + 1), 43 util::format_time int (($_[0] - 1) % $interval + 1),
44 $_[0] / $interval; 44 ($_[0] - 1) / $interval;
45 } 45 }
46 }; 46 };
47 47
48 } elsif ($timesys == TIMESYS_CANADIAN) { 48 } elsif ($timesys == TIMESYS_CANADIAN) {
49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] }; 49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
52 if (!$self->{moves}) { 52 if (!$self->{moves}) {
53 util::format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
54 } else { 54 } else {
55 my $time = int (($_[0] - 1) % $interval + 1); 55 my $time = int (($_[0] - 1) % $interval + 1);
56 56
57 sprintf "%s/%d {%d}", 57 sprintf "%s/%d =%d",
58 util::format_time $time, 58 util::format_time $time,
59 $self->{moves}, 59 $self->{moves},
60 $self->{moves} > 1
60 $time / ($self->{moves} || 1); 61 ? $time / $self->{moves}
61 62 : $interval;
62 } 63 }
63 }; 64 };
64 65
65 } else { 66 } else {
66 # none, or unknown 67 # none, or unknown
74 my $timer = $self->{time} + $self->{start} - $timestamp; 75 my $timer = $self->{time} + $self->{start} - $timestamp;
75 76
76 # we round the timer value slightly... the protocol isn't exact anyways, 77 # we round the timer value slightly... the protocol isn't exact anyways,
77 # and this gives smoother timers ;) 78 # and this gives smoother timers ;)
78 my @format = $self->{format}->(int ($timer + 0.4)); 79 my @format = $self->{format}->(int ($timer + 0.4));
79 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); 80 $self->set_text ($self->{format}->(int ($timer + 0.4)));
80 81
81 $timer - int $timer; 82 $timer - int $timer;
82} 83}
83 84
84sub set_time { 85sub set_time {
117 my ($self) = @_; 118 my ($self) = @_;
118 119
119 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 120 remove Glib::Source delete $self->{timeout} if $self->{timeout};
120} 121}
121 122
122sub destroy {
123 my ($self) = @_;
124 $self->stop;
125 $self->SUPER::destroy;
126}
127
128package game::userpanel; 123package game::userpanel;
129 124
130use base gtk::widget; 125use Glib::Object::Subclass
126 Gtk2::HBox,
127 properties => [
128 Glib::ParamSpec->IV ("colour", "colour", "User Colour", 0, 1, 0, [qw(construct-only writable)]),
129 ];
131 130
132sub new { 131sub INIT_INSTANCE {
133 my $class = shift; 132 my ($self) = @_;
134 my $self = $class->SUPER::new(@_);
135 133
136 $self->{widget} = new Gtk2::HBox;
137
138 $self->{widget}->add (my $vbox = new Gtk2::VBox); 134 $self->add (my $vbox = new Gtk2::VBox);
139 135
140 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 136 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
141 $vbox->add ($self->{info} = new Gtk2::Label ""); 137 $vbox->add ($self->{info} = new Gtk2::Label "");
142 $vbox->add (($self->{clock} = new game::goclock)->widget); 138 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock};
143 139
144 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 140 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
145 141
146 $self; 142 $self;
147} 143}
148 144
149sub configure { 145sub configure {
150 my ($self, $user, $rules) = @_; 146 my ($self, $app, $user, $rules) = @_;
151 147
152 if ($self->{name}->get_text ne $user->as_string) { 148 if ($self->{name}->get_text ne $user->as_string) {
153 $self->{name}->set_text ($user->as_string); 149 $self->{name}->set_text ($user->as_string);
154 150
155 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 151 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
156 $self->{imagebox}->add (gtk::image_from_data undef); 152 $self->{imagebox}->add (gtk::image_from_data undef);
157 $self->{imagebox}->show_all; 153 $self->{imagebox}->show_all;
158 154
155 if ($user->has_pic) {
159 # the big picture... 156 # the big picture...
160 appwin::userpic ($user->{name}, sub { 157 $app->userpic ($user->{name}, sub {
161 return unless $self->{imagebox}; 158 return unless $self->{imagebox};
159
162 if ($_[0]) { 160 if ($_[0]) {
163 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 161 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
164 $self->{imagebox}->add (gtk::image_from_data $_[0]); 162 $self->{imagebox}->add (gtk::image_from_data $_[0]);
165 $self->{imagebox}->show_all; 163 $self->{imagebox}->show_all;
164 }
166 } 165 });
167 }); 166 }
168 } 167 }
169 168
170 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); 169 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
171} 170}
172 171
180 $self->{info}->set_text ("$captures pris."); 179 $self->{info}->set_text ("$captures pris.");
181} 180}
182 181
183package game; 182package game;
184 183
184use Scalar::Util qw(weaken);
185
185use KGS::Constants; 186use KGS::Constants;
186use KGS::Game::Board; 187use KGS::Game::Board;
187 188
189use Gtk2::GoBoard;
190
191use Glib::Object::Subclass
192 Gtk2::Window;
193
188use base KGS::Listener::Game; 194use base KGS::Listener::Game;
189use base KGS::Game; 195use base KGS::Game;
190 196
191use base gtk::widget;
192
193use POSIX qw(ceil); 197use POSIX qw(ceil);
194 198
195sub new { 199sub new {
196 my $self = shift; 200 my ($self, %arg) = @_;
197 $self = $self->SUPER::new(@_); 201 $self = $self->Glib::Object::new;
202 $self->{$_} = delete $arg{$_} for keys %arg;
198 203
199 $self->listen($self->{conn}); 204 $self->listen ($self->{conn});
200 205
201 $self->{window} = new Gtk2::Window 'toplevel';
202 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
203 $self->{window}->set_title("KGS Game $title");
204 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 206 gtk::state $self, "game::window", undef, window_size => [600, 500];
205 207
208 $self->signal_connect (delete_event => sub { $self->part; 1 });
206 $self->{window}->signal_connect(delete_event => sub { 209 $self->signal_connect (destroy => sub {
207 $self->part; 210 $self->unlisten;
208 $self->destroy; 211 delete $self->{app}{game}{$self->{channel}};
209 1; 212 %{$_[0]} = ();
210 }); 213 });#d#
211 214
212 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 215 $self->add (my $hpane = new Gtk2::HPaned);
213 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 216 gtk::state $hpane, "game::hpane", undef, position => 500;
214 217
215 # LEFT PANE 218 # LEFT PANE
216 219
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 220 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
218 221
219 $self->{boardbox} = new Gtk2::VBox; 222 $self->{boardbox} = new Gtk2::VBox;
220 223
221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 224 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
222 225
223 # challenge
224
225 $self->{challenge} = new challenge channel => $self->{channel};
226
227 # board box (aspect/canvas) 226 # board box (aspect/canvas)
228 227
229 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 228 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
229
230 # RIGHT PANE
231
232 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
233 $hpane->set (position_set => 1);
234
235 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
230 236
231 { 237 {
232 $frame->add(my $vbox = new Gtk2::VBox); 238 $frame->add (my $vbox = new Gtk2::VBox);
233 $vbox->add($self->{title} = new Gtk2::Label $title); 239 $vbox->add ($self->{title} = new Gtk2::Label $title);
234 240
241 $vbox->add (my $hbox = new Gtk2::HBox);
242
243 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
244
235 $self->{moveadj} = new Gtk2::Adjustment 0, 0, 0, 1, 1, 0; 245 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
236 246
237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 247 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
238 $scale->set_draw_value (0); 248 $scale->set_draw_value (0);
239 $scale->set_digits (0); 249 $scale->set_digits (0);
240 250
241 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 251 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
242 } 252 }
243 253
244 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
245 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
246 $self->{board_label} = $aspect_frame->get_label_widget;
247
248 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
249 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
250
251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
253
254 # RIGHT PANE
255
256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1);
258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
259
260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
261 $sw->set_policy("automatic", "always");
262
263 $sw->add(($self->{userlist} = new userlist)->widget);
264
265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
266
267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 254 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
255
268 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 256 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
269 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 257 for COLOUR_WHITE, COLOUR_BLACK;
270 258
271 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 259 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
272 260
273 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 261 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
262 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
263
274 $self->{entry}->signal_connect(activate => sub { 264 $self->{chat}->signal_connect (command => sub {
275 my $text = $self->{entry}->get_text; 265 my ($chat, $cmd, $arg) = @_;
276 $self->say($text) if $text =~ /\S/; 266 if ($cmd eq "rsave") {
277 $self->{entry}->set_text(""); 267 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
268 } else {
269 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
270 }
278 }); 271 });
279 272
280 $self->event_update_game;
281 $self; 273 $self;
282} 274}
283 275
284sub event_update_users { 276sub event_update_users {
285 my ($self, $add, $update, $remove) = @_; 277 my ($self, $add, $update, $remove) = @_;
286 278
287 $self->{userlist}->update ($add, $update, $remove); 279# $self->{userlist}->update ($add, $update, $remove);
280
281 $self->{users_inlay}->refresh;
282
283 my %important;
284 $important{$self->{user1}{name}}++;
285 $important{$self->{user2}{name}}++;
286 $important{$self->{user3}{name}}++;
287
288 if (my @users = grep $important{$_->{name}}, @$add) {
289 $self->{chat}->append_text ("\n<header>Joins:</header>");
290 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
291 }
292 if (my @users = grep $important{$_->{name}}, @$remove) {
293 $self->{chat}->append_text ("\n<header>Parts:</header>");
294 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
295 }
296
288} 297}
289 298
290sub join { 299sub join {
291 my ($self) = @_; 300 my ($self) = @_;
292 return if $self->{joined}; 301 return if $self->{joined};
293 302
294 $self->SUPER::join; 303 $self->SUPER::join;
295
296 $self->{window}->show_all;
297}
298
299sub part {
300 my ($self) = @_;
301
302 $self->SUPER::part;
303 $self->destroy;
304}
305
306sub configure_event {
307 my ($widget, $event, $self) = @_;
308 delete $self->{stack};
309 delete $self->{pixbuf};
310 delete $self->{board_shown};
311 delete $self->{background};
312 $self->repaint_board;
313 0;
314}
315
316sub expose_event {
317 my ($widget, $event, $self) = @_;
318
319 $self->{pixbuf} or return;
320
321 my $area = $event->area;
322
323 $self->redraw ($area);
324
325 0;
326}
327
328# something Gtk2 fixed
329sub INTERP_NEAREST (){ 'nearest' }
330sub INTERP_TILES (){ 'tiles' }
331sub INTERP_BILINEAR (){ 'bilinear' }
332sub INTERP_HYPER (){ 'hyper' }
333
334sub new_pixbuf {
335 my ($w, $h, $alpha, $fill) = @_;
336
337 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
338 $pixbuf->fill ($fill) if defined $fill;
339
340 $pixbuf;
341}
342
343sub scale_pixbuf {
344 my ($src, $w, $h, $mode) = @_;
345
346 my $dst = new_pixbuf $w, $h, 1;
347
348 $src->scale(
349 $dst, 0, 0, $w, $h, 0, 0,
350 $w / $src->get_width, $h / $src->get_height,
351 $mode,
352 );
353
354 $dst;
355}
356
357# create a stack of stones
358sub create_stack {
359 my ($self, $mark, $size, $rand) = @_;
360
361 my $shadow = $size * 0.05;
362
363 my $c = \$self->{stack}{$mark};
364 unless ($$c) {
365 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
366 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
367
368 # zeroeth the shadow
369 if ($mark & (MARK_B | MARK_W)) {
370 # the -0.5's are a mystery to me
371 $::shadow_img->composite (
372 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
373 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
374 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
375 );
376 }
377
378 # first the big stones (handicap stones could be different)
379 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
380 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
381 [MARK_GRAY_B, 128],
382 [MARK_GRAY_W, 128]) {
383 my ($mask, $alpha) = @$_;
384 if ($mark & $mask) {
385 $stone->composite (
386 $base, 0, 0, $size, $size, 0, 0,
387 $size / $stone->get_width, $size / $stone->get_height,
388 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
389 );
390 }
391 }
392
393 # then the small stones
394 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
395 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
396 my ($mask, $img) = @$_;
397 if ($mark & $mask) {
398 $img->composite (
399 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
400 $size / $img->get_width / 2, $size / $img->get_height / 2,
401 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
402 );
403 }
404 }
405
406 # and lastly any markers
407 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
408
409 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
410 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
411 [MARK_SQUARE, $::square_img[$dark_bg]]) {
412 my ($mask, $img) = @$_;
413 if ($mark & $mask) {
414 $img->composite (
415 $base, 0, 0, $size, $size, 0, 0,
416 $size / $img->get_width, $size / $img->get_height,
417 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
418 );
419 }
420 }
421
422 push @$$c, $base;
423 }
424 }
425
426 $$c->[$rand % @$$c];
427}
428
429sub pixbuf_text {
430 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
431
432 my @c = grep $_,
433 map $::font[$colour][$::fontmap{$_}],
434 split //, $text;
435
436 if (@c) {
437 my $spacing = $height * 0.1;
438 my $s = $height / List::Util::max map $_->get_height, @c;
439 my $W = List::Util::sum map $_->get_width, @c;
440
441 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
442 $y -= $height * 0.5;
443
444 for (@c) {
445 my $w = $_->get_width * $s;
446 # +2 == don't fight the rounding
447 $_->composite ($pixbuf,
448 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
449 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
450
451 $x += $w + $spacing;
452 }
453 }
454}
455
456sub pixbuf_rect {
457 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
458 # we fake lines by... a horrible method :/
459 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
460 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
461 INTERP_NEAREST, $alpha);
462}
463
464sub repaint_board {
465 my ($self) = @_;
466 my $canvas = $self->{canvas};
467 my $expose_area = undef;
468
469 return $expose_area unless $self->{board};
470
471 my ($w, $h) = ($canvas->allocation->values)[2,3];
472
473 die "FATAL: board aspect ratio != 1" unless $w == $h;
474
475 my $s = $w;
476
477 return unless $s >= 200;
478
479 my $size = $self->{size};
480
481 # we leave enough space for the shadows.. I like smaller stones, and we
482 # do no need to do the nifty recursive screen updates that goban2 does
483 my $border = int ($s / ($size + 3) * 0.5);
484 my $s2 = $s - $border * 2;
485 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
486 my $ofs = int ($edge / 2);
487
488 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
489
490 my $pixbuf;
491
492 my $oldboard;
493
494 if ($self->{background}) {
495 if ($oldboard = $self->{board_shown}) {
496 $pixbuf = $self->{pixbuf};
497 } else {
498 $pixbuf = $self->{background}->copy;
499 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
500 }
501 } else {
502 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
503
504 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
505
506 if ($s < $bw && $s < $bh) {
507 $pixbuf = new_pixbuf $s, $s, 0;
508 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
509 } else {
510 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
511 }
512
513 my $linew = int ($s / 40 / $size);
514
515 # ornamental border... we have time to waste :/
516 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
517 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
518 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
519 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
520
521 for my $i (1 .. $size) {
522 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
523 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
524
525 # 38 max, but we allow a bit more
526 my $label = (qw(- A B C D E F G H J K L M N O P Q R S T U V W X Y Z
527 AA BB CC DD EE FF GG HH JJ KK LL MM NN OO PP QQ RR SS TT UU VV WW XX YY ZZ))[$i];
528
529 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
530 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
531 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
532 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
533
534 $a++;
535 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
536 }
537
538 # hoshi points
539 my $hoshi = sub {
540 my ($x, $y) = @_;
541 my $hs = int ($edge / 4) | 1;
542 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
543
544 # we use the shadow mask... not perfect, but I want to finish this
545 $::shadow_img->composite ($pixbuf,
546 $x, $y, $hs + 1, $hs + 1, $x, $y,
547 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
548 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
549 };
550
551 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
552 $hoshi->($h1, $h1);
553 $hoshi->($size - $h1 + 1, $h1);
554 $hoshi->($h1, $size - $h1 + 1);
555 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
556
557 if ($size % 2) { # on odd boards, also the remaining 5
558 my $h2 = ($size + 1) / 2;
559 if ($size > 10) {
560 $hoshi->($h1, $h2);
561 $hoshi->($size - $h1 + 1, $h2);
562 $hoshi->($h2, $size - $h1 + 1);
563 $hoshi->($h2, $h1);
564 }
565 # the tengen
566 $hoshi->($h2, $h2);
567 }
568
569 unless ($::config->{conserve_memory} > 1) {
570 $self->{background} = $pixbuf;
571 $pixbuf = $pixbuf->copy;
572 }
573 }
574
575 $self->{pixbuf} = $pixbuf;
576
577 for my $x (1 .. $size) {
578 for my $y (1 .. $size) {
579 my $rand = ($x ^ $y ^ 0x5555);
580
581 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
582
583 if ($::config->{randomize}) {
584 $dx += ($rand % 7) - 3;
585 $dy += ($rand / 3 % 7) - 3;
586 }
587
588 my $shadow = $edge * 0.05;
589 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
590
591 my $mark = $self->{board}{board}[$x-1][$y-1];
592 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
593
594 if ($oldboard) {
595 next if $old == $mark; # no change
596
597 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
598 $expose_area = $expose_area
599 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
600 : new Gtk2::Gdk::Rectangle @$area;
601 }
602
603 if ($mark) {
604 my $pb = $self->create_stack($mark, $edge, $rand);
605
606 $pb->composite ($pixbuf, @$area,
607 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
608
609 # labels are handled here because they are quite rare
610 if ($mark & MARK_LABEL) {
611 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
612
613 if ($white) {
614 pixbuf_text $pixbuf, 0,
615 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
616 $self->{board}{label}[$x-1][$y-1];
617 }
618 pixbuf_text $pixbuf, $white,
619 $k[$x], $k[$y], $ofs * 0.7,
620 $self->{board}{label}[$x-1][$y-1];
621 }
622 }
623 }
624 }
625
626 $self->{board_shown} = Storable::dclone $self->{board};
627 #d# save
628 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
629
630 $expose_area;
631}
632
633sub redraw {
634 my ($self, $area) = @_;
635
636 if ($area && $self->{pixbuf}) {
637 my ($x, $y, $w, $h) = $area->values;
638
639 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
640 $x, $y, $x, $y, $w, $h,
641 "normal", 0, 0);
642 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
643 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
644 }
645} 304}
646 305
647sub update_board { 306sub update_board {
648 my ($self) = @_; 307 my ($self) = @_;
649 return unless $self->{path}; 308 return unless $self->{path};
650 309
651 my $move = int $self->{moveadj}->get_value; 310 my $move = int $self->{moveadj}->get_value;
652 311
653 my $running = $move == @{$self->{path}}; 312 my $running = $move == @{$self->{path}};
654 313
655 $self->{board_label}->set_text ("Move $move"); 314 $self->{board_label}->set_text ("Move " . ($move - 1));
656 315
657 $self->{board} = new KGS::Game::Board $self->{size}; 316 $self->{cur_board} = new KGS::Game::Board $self->{size};
658 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 317 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
659 318
660 for my $colour (WHITE, BLACK) { 319 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
661 $self->{userpanel}[$colour]->set_state ( 320 $self->{userpanel}[$colour]->set_state (
662 $self->{board}{captures}[$colour], 321 $self->{cur_board}{captures}[$colour],
663 $self->{board}{timer}[$colour], 322 $self->{cur_board}{timer}[$colour],
664 ($running && $self->{lastmove_colour} == !$colour) 323 ($running && $self->{lastmove_colour} == !$colour)
665 ? $self->{lastmove_time} : 0 324 ? $self->{lastmove_time} : 0
666 ); 325 );
667 } 326 }
668 327
669 $self->redraw ($self->repaint_board); 328 $self->{board}->set_board ($self->{cur_board});
670} 329}
671 330
672sub event_update_tree { 331sub event_update_tree {
673 my ($self) = @_; 332 my ($self) = @_;
674 333
675 $self->{path} = $self->get_path; 334 $self->{path} = $self->get_path;
676 335
677 if ($self->{moveadj}) { 336 if ($self->{moveadj}) {
678 my $upper = $self->{moveadj}->upper; 337 my $upper = $self->{moveadj}->upper;
679 my $pos = $self->{moveadj}->get_value; 338 my $pos = $self->{moveadj}->get_value;
339 my $move = scalar @{$self->{path}};
680 340
681 $self->{moveadj}->upper (scalar @{$self->{path}}); 341 $self->{moveadj}->upper ($move);
682 342
683 $self->{moveadj}->changed; 343 $self->{moveadj}->changed;
684 if ($pos == $upper) { 344 if ($pos == $upper) {
685 $self->{moveadj}->set_value (scalar @{$self->{path}}); 345 $self->{moveadj}->value ($move);
686 } else {
687 $self->{moveadj}->value_changed; 346 $self->{moveadj}->value_changed;
688 } 347 }
689 } 348 }
690} 349}
691 350
698 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>" 357 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
699 if $newnode; 358 if $newnode;
700 359
701 for (split /\n/, $comment) { 360 for (split /\n/, $comment) {
702 $text .= "\n"; 361 $text .= "\n";
703 if ($_ =~ s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) { 362 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
704 $text .= "<user>" . (util::toxml $1) . "</user>:"; 363 $text .= "<user>" . (util::toxml $1) . "</user>:";
705 } 364 }
365
366 # coords only for 19x19 so far
367 $_ = util::toxml $_;
368 s{
369 (
370 \b
371 (?:[bw])?
372 [, ]{0,2}
373 [a-hj-t] # valid for upto 19x19
374 \s?
375 [1-9]?[0-9]
376 \b
377 )
378 }{
379 "<coord>$1</coord>";
380 }sgexi;
381
706 $text .= $_; 382 $text .= $_;
707 } 383 }
708 384
709 $self->{text}->append_text ($text); 385 $self->{chat}->append_text ($text);
710} 386}
711 387
712sub event_join { 388sub event_join {
713 my ($self) = @_; 389 my ($self) = @_;
390
714 $self->SUPER::event_join; 391 $self->SUPER::event_join (@_);
392 $self->event_update_game;
393 $self->show_all;
715} 394}
716 395
717sub event_part { 396sub event_part {
718 my ($self) = @_; 397 my ($self) = @_;
398
719 $self->SUPER::event_part; 399 $self->SUPER::event_part;
400 $self->destroy;
720} 401}
721 402
722sub event_move { 403sub event_move {
723 my ($self, $pass) = @_; 404 my ($self, $pass) = @_;
724 sound::play 1, $pass ? "pass" : "move"; 405 sound::play 1, $pass ? "pass" : "move";
725} 406}
726 407
727sub event_update_game { 408sub event_update_game {
728 my ($self) = @_; 409 my ($self) = @_;
410
729 $self->SUPER::event_update_game; 411 $self->SUPER::event_update_game;
730 412
413 return unless $self->{joined};
414
415 my $title = defined $self->{channel}
416 ? $self->owner->as_string . " " . $self->opponent_string
417 : "Game Window";
418 $self->set_title("KGS Game $title");
419 $self->{title}->set_text ($title);
420
731 $self->{user}[BLACK] = $self->{user1}; 421 $self->{user}[COLOUR_BLACK] = $self->{user1};
732 $self->{user}[WHITE] = $self->{user2}; 422 $self->{user}[COLOUR_WHITE] = $self->{user2};
733 423
734 # show board 424 # show board
735
736 $self->{left}->remove ($_) for $self->{left}->get_children;
737 if ($self->is_valid) { 425 if ($self->is_inprogress) {
426 if (!$self->{boardbox}->parent) {
427 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
738 $self->{left}->add ($self->{boardbox}); 428 $self->{left}->add ($self->{boardbox});
739 (delete $self->{challenge})->destroy if $self->{challenge}; 429 }
740 } else { 430 if (my $ch = delete $self->{challenge}) {
741 $self->{left}->add ($self->{challenge}->widget); 431 (delete $_->{inlay})->clear for values %$ch;
432 }
742 } 433 }
434
743 $self->{left}->show_all; 435 $self->{left}->show_all;
744 436
745 # view text 437 $self->{rules_inlay}->refresh;
746 438
747 $text = "\n<header>Game Update</header>"; 439}
440
441sub draw_setup {
442 my ($self, $inlay) = @_;
443
444 my $rules = $self->{rules};
445
446 my $text = "";
447
448 ## Rules
449
450 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
451
452 $text .= "\nTime: ";
453
454 if ($rules->{timesys} == TIMESYS_NONE) {
455 $text .= "UNLIMITED";
456 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
457 $text .= util::format_time $rules->{time};
458 $text .= " ABS";
459 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
460 $text .= util::format_time $rules->{time};
461 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
462 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
463 $text .= util::format_time $rules->{time};
464 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
465 }
748 466
467 ## Other state info
468
749 $text .= "\nType: " . (util::toxml $gametype{$self->type}) 469 $text .= "\nType: " . util::toxml $self->type_char;
750 . " (" . (util::toxml $gameopt{$self->option}) . ")";
751 $text .= "\nFlags:"; 470 $text .= "\nFlags:";
752 $text .= " valid" if $self->is_valid; 471 $text .= " started" if $self->is_inprogress;
753 $text .= " adjourned" if $self->is_adjourned; 472 $text .= " adjourned" if $self->is_adjourned;
754 $text .= " scored" if $self->is_scored; 473 $text .= " scored" if $self->is_scored;
755 $text .= " saved" if $self->is_saved; 474 $text .= " saved" if $self->is_saved;
756 475
757 $text .= "\nWhite: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"; 476 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
477 if $self->{user3}->is_valid;
478
479 if ($self->is_inprogress) {
758 $text .= "\nBlack: <user>" . (util::toxml $self->{user1}->as_string) . "</user>"; 480 $text .= "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
759 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 481 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
760
761 if ($self->is_valid) {
762 $text .= "\nHandicap: " . $self->{handicap}; 482 $text .= "\nHandicap: " . $self->{handicap};
763 $text .= "\nKomi: " . $self->{komi}; 483 $text .= "\nKomi: " . $self->{komi};
764 $text .= "\nSize: " . $self->size_string; 484 $text .= "\nSize: " . $self->size_string;
765 } 485 }
766 486
487 if ($self->is_scored) {
488 $text .= "\nResult: " . $self->score_string;
489 }
490
767 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 491 $inlay->append_text ("<infoblock>$text</infoblock>");
492
768} 493}
769 494
770sub event_update_rules { 495sub event_update_rules {
771 my ($self, $rules) = @_; 496 my ($self, $rules) = @_;
772 497
498 $self->{rules} = $rules;
499
500 if ($self->{user}) {
773 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) 501 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
774 for BLACK, WHITE; 502 for COLOUR_BLACK, COLOUR_WHITE;
775
776 my $text = "\n<header>Game Rules</header>";
777
778 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
779
780 $text .= "\nTime: ";
781
782 if ($rules->{timesys} == TIMESYS_NONE) {
783 $text .= "infinite";
784 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
785 $text .= util::format_time $rules->{time};
786 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
787 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
788 $text .= sprintf " + %s (%d)", util::format_time $rules->{interval}, $rules->{count};
789 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
790 $text .= util::format_time $rules->{time};
791 $text .= sprintf " + %s/%d", util::format_time $rules->{interval}, $rules->{count};
792 }
793 503 }
794 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 504
505 sound::play 3, "gamestart";
506
507 $self->{rules_inlay}->refresh;
795} 508}
796 509
797sub inject_resign_game { 510sub inject_resign_game {
798 my ($self, $msg) = @_; 511 my ($self, $msg) = @_;
799 512
513 sound::play 3, "resign";
514
800 $self->{text}->append_text ("\n<infoblock><header>Resign</header><user>" 515 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
516 . "\n<user>"
801 . (util::toxml $self->{user}[$msg->{player}]->as_string) 517 . (util::toxml $self->{user}[$msg->{player}]->as_string)
802 . "</user> resigned.</infoblock>"); 518 . "</user> resigned.</infoblock>");
803} 519}
804 520
805sub inject_final_result { 521sub inject_final_result {
806 my ($self, $msg) = @_; 522 my ($self, $msg) = @_;
807 523
808 $self->{text}->append_text ("\n<header>Game Over</header>" 524 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
809 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 525 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
810 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 526 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
527 . "</infoblock>"
811 ); 528 );
812} 529}
813 530
814sub destroy { 531sub draw_challenge {
815 my ($self) = @_; 532 my ($self, $c) = @_;
816 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 533
817 for BLACK, WHITE; 534 my $inlay = $c->{inlay};
818 $self->SUPER::destroy; 535 my $challenge = $c->{challenge};
819 delete $appwin::gamelist->{game}{$self->{channel}}; 536 my $rules = $challenge->{rules};
537
538 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
539 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
540
541 $inlay->append_text ("\n<challenge>Challenge to <user>" . $opponent->as_string . "</user></challenge>");
542 $inlay->append_text ("\nHandicap: $rules->{handicap}");
543
544#bless( (
545# gametype => 3,
546# user1 => bless( {
547# flags => 2633,
548# name => 'dorkusx'
549# }, 'KGS::User' ),
550# rules => bless( {
551# count => 5,
552# time => 900,
553# timesys => 2,
554# interval => 30,
555# komi => '6.5',
556# size => 19,
557# ruleset => 0,
558# handicap => 0
559# }, 'KGS::Rules' ),
560# user2 => bless( {
561# flags => 436220808,
562# name => 'Nerdamus'
563# }, 'KGS::User' )
564# ), 'KGS::Challenge' )
565}
566
567sub draw_users {
568 my ($self, $inlay) = @_;
569
570 for (sort keys %{$self->{users}}) {
571 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
572 }
573}
574
575sub event_challenge {
576 my ($self, $challenge) = @_;
577
578 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
579 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
580
581 my $c = $self->{challenge}{$opponent->{name}} ||= {};
582
583 $c->{inlay} ||= $self->{chat}->new_inlay;
584 $c->{challenge} = $challenge;
585
586 $self->draw_challenge ($c);
587
588# require KGS::Listener::Debug;
589# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
820} 590}
821 591
8221; 5921;
823 593

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines