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.63 by pcg, Thu Jun 19 01:29:40 2003 UTC vs.
Revision 1.88 by pcg, Fri May 21 16:13:41 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
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
159 if ($user->has_pic) { 155 if ($user->has_pic) {
160 # the big picture... 156 # the big picture...
161 appwin::userpic ($user->{name}, sub { 157 $app->userpic ($user->{name}, sub {
162 return unless $self->{imagebox}; 158 return unless $self->{imagebox};
159
163 if ($_[0]) { 160 if ($_[0]) {
164 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 161 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
165 $self->{imagebox}->add (gtk::image_from_data $_[0]); 162 $self->{imagebox}->add (gtk::image_from_data $_[0]);
166 $self->{imagebox}->show_all; 163 $self->{imagebox}->show_all;
167 } 164 }
182 $self->{info}->set_text ("$captures pris."); 179 $self->{info}->set_text ("$captures pris.");
183} 180}
184 181
185package game; 182package game;
186 183
184use Scalar::Util qw(weaken);
185
187use KGS::Constants; 186use KGS::Constants;
188use KGS::Game::Board; 187use KGS::Game::Board;
189 188
189use Gtk2::GoBoard;
190
191use Glib::Object::Subclass
192 Gtk2::Window;
193
190use base KGS::Listener::Game; 194use base KGS::Listener::Game;
191use base KGS::Game; 195use base KGS::Game;
192 196
193use base gtk::widget;
194
195use POSIX qw(ceil); 197use POSIX qw(ceil);
196 198
197sub new { 199sub new {
198 my $self = shift; 200 my ($self, %arg) = @_;
199 $self = $self->SUPER::new(@_); 201 $self = $self->Glib::Object::new;
202 $self->{$_} = delete $arg{$_} for keys %arg;
200 203
201 $self->listen($self->{conn}); 204 $self->listen ($self->{conn});
202 205
203 $self->{window} = new Gtk2::Window 'toplevel';
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);
230 229
231 { 230 {
232 $frame->add(my $vbox = new Gtk2::VBox); 231 $frame->add (my $vbox = new Gtk2::VBox);
233 $vbox->add($self->{title} = new Gtk2::Label $title); 232 $vbox->add ($self->{title} = new Gtk2::Label $title);
233
234 $vbox->add (my $hbox = new Gtk2::HBox);
235
236 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
234 237
235 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 238 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
236 239
237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 240 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
238 $scale->set_draw_value (0); 241 $scale->set_draw_value (0);
239 $scale->set_digits (0); 242 $scale->set_digits (0);
240 243
241 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 244 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
242 } 245 }
243 246
244 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0); 247 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
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);
250
251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
253 248
254 # RIGHT PANE 249 # RIGHT PANE
255 250
256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); 251 $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1); 252 $hpane->set (position_set => 1);
258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 253 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
259 254
260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 255# $self->{vpane}->add (my $sw = new Gtk2::ScrolledWindow);
261 $sw->set_policy("automatic", "always"); 256# $sw->set_policy ("automatic", "always");
262
263 $sw->add(($self->{userlist} = new userlist)->widget); 257# $sw->add ($self->{userlist} = new userlist);
264 258
265 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 259 $self->{vpane}->add (my $vbox = new Gtk2::VBox);
266 260
267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 261 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
262
268 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 263 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
269 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 264 for COLOUR_WHITE, COLOUR_BLACK;
270 265
271 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 266 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
272 267
273 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 268 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Rules", sub { $self->draw_rules (@_) }, 1);
269 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 0);
270
274 $self->{entry}->signal_connect(activate => sub { 271 $self->{chat}->signal_connect (command => sub {
275 my $text = $self->{entry}->get_text; 272 my ($chat, $cmd, $arg) = @_;
276 $self->say($text) if $text =~ /\S/; 273 if ($cmd eq "rsave") {
277 $self->{entry}->set_text(""); 274 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
275 } else {
276 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
277 }
278 }); 278 });
279 279
280 $self->event_update_game;
281 $self; 280 $self;
282} 281}
283 282
284sub event_update_users { 283sub event_update_users {
285 my ($self, $add, $update, $remove) = @_; 284 my ($self, $add, $update, $remove) = @_;
286 285
287 $self->{userlist}->update ($add, $update, $remove); 286# $self->{userlist}->update ($add, $update, $remove);
287
288 $self->{users_inlay}->refresh;
288 289
289 my %important; 290 my %important;
290 $important{$self->{user1}{name}}++; 291 $important{$self->{user1}{name}}++;
291 $important{$self->{user2}{name}}++; 292 $important{$self->{user2}{name}}++;
292 $important{$self->{user3}{name}}++; 293 $important{$self->{user3}{name}}++;
293 294
294 if (my @users = grep $important{$_->{name}}, @$add) { 295 if (my @users = grep $important{$_->{name}}, @$add) {
295 $self->{text}->append_text ("\n<header>Joins:</header>"); 296 $self->{chat}->append_text ("\n<header>Joins:</header>");
296 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 297 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
297 } 298 }
298 if (my @users = grep $important{$_->{name}}, @$remove) { 299 if (my @users = grep $important{$_->{name}}, @$remove) {
299 $self->{text}->append_text ("\n<header>Parts:</header>"); 300 $self->{chat}->append_text ("\n<header>Parts:</header>");
300 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 301 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
301 } 302 }
302 303
303} 304}
304 305
305sub join { 306sub join {
306 my ($self) = @_; 307 my ($self) = @_;
307 return if $self->{joined}; 308 return if $self->{joined};
308 309
309 $self->SUPER::join; 310 $self->SUPER::join;
310
311 $self->{window}->show_all;
312}
313
314sub part {
315 my ($self) = @_;
316
317 $self->SUPER::part;
318 $self->destroy;
319}
320
321sub configure_event {
322 my ($widget, $event, $self) = @_;
323 delete $self->{stack};
324 delete $self->{pixbuf};
325 delete $self->{board_shown};
326 delete $self->{background};
327 $self->repaint_board;
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;
339}
340
341# something Gtk2 fixed
342sub INTERP_NEAREST (){ 'nearest' }
343sub INTERP_TILES (){ 'tiles' }
344sub INTERP_BILINEAR (){ 'bilinear' }
345sub INTERP_HYPER (){ 'hyper' }
346
347sub new_pixbuf {
348 my ($w, $h, $alpha, $fill) = @_;
349
350 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
351 $pixbuf->fill ($fill) if defined $fill;
352
353 $pixbuf;
354}
355
356sub scale_pixbuf {
357 my ($src, $w, $h, $mode) = @_;
358
359 my $dst = new_pixbuf $w, $h, 1;
360
361 $src->scale(
362 $dst, 0, 0, $w, $h, 0, 0,
363 $w / $src->get_width, $h / $src->get_height,
364 $mode,
365 );
366
367 $dst;
368}
369
370# create a stack of stones
371sub create_stack {
372 my ($self, $mark, $size, $rand) = @_;
373
374 my $shadow = $size * 0.05;
375
376 my $c = \$self->{stack}{$mark};
377 unless ($$c) {
378 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
379 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
380
381 # zeroeth the shadow
382 if ($mark & (MARK_B | MARK_W)) {
383 # the -0.5's are a mystery to me
384 $::shadow_img->composite (
385 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
386 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
387 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
388 );
389 }
390
391 # first the big stones (handicap stones could be different)
392 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
393 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
394 [MARK_GRAY_B, 128],
395 [MARK_GRAY_W, 128]) {
396 my ($mask, $alpha) = @$_;
397 if ($mark & $mask) {
398 $stone->composite (
399 $base, 0, 0, $size, $size, 0, 0,
400 $size / $stone->get_width, $size / $stone->get_height,
401 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
402 );
403 }
404 }
405
406 # then the small stones
407 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
408 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
409 my ($mask, $img) = @$_;
410 if ($mark & $mask) {
411 $img->composite (
412 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
413 $size / $img->get_width / 2, $size / $img->get_height / 2,
414 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
415 );
416 }
417 }
418
419 # and lastly any markers
420 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
421
422 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
423 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
424 [MARK_SQUARE, $::square_img[$dark_bg]]) {
425 my ($mask, $img) = @$_;
426 if ($mark & $mask) {
427 $img->composite (
428 $base, 0, 0, $size, $size, 0, 0,
429 $size / $img->get_width, $size / $img->get_height,
430 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
431 );
432 }
433 }
434
435 push @$$c, $base;
436 }
437 }
438
439 $$c->[$rand % @$$c];
440}
441
442sub pixbuf_text {
443 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
444
445 my @c = grep $_,
446 map $::font[$colour][$::fontmap{$_}],
447 split //, $text;
448
449 if (@c) {
450 my $spacing = $height * 0.1;
451 my $s = $height / List::Util::max map $_->get_height, @c;
452 my $W = List::Util::sum map $_->get_width, @c;
453
454 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
455 $y -= $height * 0.5;
456
457 for (@c) {
458 my $w = $_->get_width * $s;
459 # +2 == don't fight the rounding
460 $_->composite ($pixbuf,
461 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
462 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
463
464 $x += $w + $spacing;
465 }
466 }
467}
468
469sub pixbuf_rect {
470 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
471 # we fake lines by... a horrible method :/
472 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
473 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
474 INTERP_NEAREST, $alpha);
475}
476
477sub repaint_board {
478 my ($self) = @_;
479 my $canvas = $self->{canvas};
480
481 return unless $self->{board};
482
483 my ($w, $h) = ($canvas->allocation->values)[2,3];
484
485 die "FATAL: board aspect ratio != 1" unless $w == $h;
486
487 my $s = $w;
488
489 return unless $s >= 200;
490
491 my $size = $self->{size};
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
495 my $border = int ($s / ($size + 3) * 0.5);
496 my $s2 = $s - $border * 2;
497 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
498 my $ofs = int ($edge / 2);
499
500 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
501
502 my $pixbuf;
503
504 my $oldboard;
505
506 if ($self->{background}) {
507 if ($oldboard = $self->{board_shown}) {
508 $pixbuf = $self->{pixbuf};
509 } else {
510 $pixbuf = $self->{background}->copy;
511 $self->{canvas}->queue_draw_area (0, 0, $s, $s);
512 }
513 } else {
514 $self->{canvas}->queue_draw_area (0, 0, $s, $s);
515
516 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
517
518 if ($s < $bw && $s < $bh) {
519 $pixbuf = new_pixbuf $s, $s, 0;
520 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
521 } else {
522 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
523 }
524
525 my $linew = int ($s / 40 / $size);
526
527 # ornamental border... we have time to waste :/
528 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
529 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
530 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
531 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
532
533 for my $i (1 .. $size) {
534 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
535 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
536
537 # 38 max, but we allow a bit more
538 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
539 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];
540
541 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
542 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
543 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
544 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
545
546 $a++;
547 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
548 }
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
581 unless ($::config->{conserve_memory} > 1) {
582 $self->{background} = $pixbuf;
583 $pixbuf = $pixbuf->copy;
584 }
585 }
586
587 $self->{pixbuf} = $pixbuf;
588
589 for my $x (1 .. $size) {
590 for my $y (1 .. $size) {
591 my $rand = ($x ^ $y ^ 0x5555);
592
593 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
594
595 if ($::config->{randomize}) {
596 $dx += ($rand % 7) - 3;
597 $dy += ($rand / 3 % 7) - 3;
598 }
599
600 my $shadow = $edge * 0.05;
601 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
602
603 my $mark = $self->{board}{board}[$x-1][$y-1];
604 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
605
606 if ($oldboard) {
607 next if $old == $mark; # no change
608
609 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
610 }
611
612 if ($mark) {
613 my $pb = $self->create_stack($mark, $edge, $rand);
614
615 $pb->composite ($pixbuf, @$area,
616 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
617
618 # labels are handled here because they are quite rare
619 if ($mark & MARK_LABEL) {
620 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
621
622 if ($white) {
623 pixbuf_text $pixbuf, 0,
624 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
625 $self->{board}{label}[$x-1][$y-1];
626 }
627 pixbuf_text $pixbuf, $white,
628 $k[$x], $k[$y], $ofs * 0.7,
629 $self->{board}{label}[$x-1][$y-1];
630 }
631 }
632
633 if ($oldboard) {
634 $self->redraw (@$area);
635 }
636 }
637 }
638
639 $self->{board_shown} = Storable::dclone $self->{board};
640}
641
642sub redraw {
643 my ($self, $x, $y, $w, $h) = @_;
644
645 if ($self->{pixbuf}) {
646 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
647 $x, $y, $x, $y, $w, $h,
648 "normal", 0, 0);
649 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
650 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
651 }
652} 311}
653 312
654sub update_board { 313sub update_board {
655 my ($self) = @_; 314 my ($self) = @_;
656 return unless $self->{path}; 315 return unless $self->{path};
659 318
660 my $running = $move == @{$self->{path}}; 319 my $running = $move == @{$self->{path}};
661 320
662 $self->{board_label}->set_text ("Move " . ($move - 1)); 321 $self->{board_label}->set_text ("Move " . ($move - 1));
663 322
664 $self->{board} = new KGS::Game::Board $self->{size}; 323 $self->{cur_board} = new KGS::Game::Board $self->{size};
665 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 324 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
666 325
667 for my $colour (WHITE, BLACK) { 326 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
668 $self->{userpanel}[$colour]->set_state ( 327 $self->{userpanel}[$colour]->set_state (
669 $self->{board}{captures}[$colour], 328 $self->{cur_board}{captures}[$colour],
670 $self->{board}{timer}[$colour], 329 $self->{cur_board}{timer}[$colour],
671 ($running && $self->{lastmove_colour} == !$colour) 330 ($running && $self->{lastmove_colour} == !$colour)
672 ? $self->{lastmove_time} : 0 331 ? $self->{lastmove_time} : 0
673 ); 332 );
674 } 333 }
675 334
676 $self->repaint_board; 335 $self->{board}->set_board ($self->{cur_board});
677} 336}
678 337
679sub event_update_tree { 338sub event_update_tree {
680 my ($self) = @_; 339 my ($self) = @_;
681 340
728 }sgexi; 387 }sgexi;
729 388
730 $text .= $_; 389 $text .= $_;
731 } 390 }
732 391
733 $self->{text}->append_text ($text); 392 $self->{chat}->append_text ($text);
734} 393}
735 394
736sub event_join { 395sub event_join {
737 my ($self) = @_; 396 my ($self) = @_;
397
738 $self->SUPER::event_join; 398 $self->SUPER::event_join (@_);
399 $self->event_update_game;
400 $self->show_all;
739} 401}
740 402
741sub event_part { 403sub event_part {
742 my ($self) = @_; 404 my ($self) = @_;
405
743 $self->SUPER::event_part; 406 $self->SUPER::event_part;
744 $self->destroy; 407 $self->destroy;
745} 408}
746 409
747sub event_move { 410sub event_move {
751 414
752sub event_update_game { 415sub event_update_game {
753 my ($self) = @_; 416 my ($self) = @_;
754 $self->SUPER::event_update_game; 417 $self->SUPER::event_update_game;
755 418
756 my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window"; 419 return unless $self->{joined};
420
421 my $title = defined $self->{channel}
422 ? $self->owner->as_string . " " . $self->opponent_string
423 : "Game Window";
757 $self->{window}->set_title("KGS Game $title"); 424 $self->set_title("KGS Game $title");
758 $self->{title}->set_text ($title); 425 $self->{title}->set_text ($title);
759 426
760 $self->{user}[BLACK] = $self->{user1}; 427 $self->{user}[COLOUR_BLACK] = $self->{user1};
761 $self->{user}[WHITE] = $self->{user2}; 428 $self->{user}[COLOUR_WHITE] = $self->{user2};
762 429
763 # show board 430 # show board
431 if ($self->is_inprogress) {
432 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
433 if (my $ch = delete $self->{challenge}) {
434 (delete $_->{inlay})->clear for values %$ch;
435 }
764 436 }
765 $self->{left}->remove ($_) for $self->{left}->get_children; 437
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; 438 $self->{left}->show_all;
773 439
774 # view text 440 # view text
775 441
442 eval { #d#
776 my @ga; 443 my @ga;
777 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) 444 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
778 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 445 . " (" . (util::toxml $gameopt{$self->option}) . ")";
779 $ga[1] = "\nFlags:"; 446 $ga[1] = "\nFlags:";
780 $ga[1] .= " valid" if $self->is_valid; 447 $ga[1] .= " started" if $self->is_inprogress;
781 $ga[1] .= " adjourned" if $self->is_adjourned; 448 $ga[1] .= " adjourned" if $self->is_adjourned;
782 $ga[1] .= " scored" if $self->is_scored; 449 $ga[1] .= " scored" if $self->is_scored;
783 $ga[1] .= " saved" if $self->is_saved; 450 $ga[1] .= " saved" if $self->is_saved;
784 451
785 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 452 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
453 if $self->{user3}->is_inprogress;
786 454
787 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 455 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
788 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 456 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
789 if $self->is_valid; 457 if $self->is_inprogress;
790 458
791 if ($self->is_valid) { 459 if ($self->is_inprogress) {
792 $ga[4] = "\nHandicap: " . $self->{handicap}; 460 $ga[4] = "\nHandicap: " . $self->{handicap};
793 $ga[5] = "\nKomi: " . $self->{komi}; 461 $ga[5] = "\nKomi: " . $self->{komi};
794 $ga[6] = "\nSize: " . $self->size_string; 462 $ga[6] = "\nSize: " . $self->size_string;
795 } 463 }
796 464
805 } 473 }
806 } 474 }
807 $text .= "</infoblock>"; 475 $text .= "</infoblock>";
808 476
809 $self->{gatext} = \@ga; 477 $self->{gatext} = \@ga;
478 };
810 479
811 $self->{text}->append_text ($text); 480 $self->{chat}->append_text ($text);
812} 481}
813 482
814sub event_update_rules { 483sub draw_rules {
815 my ($self, $rules) = @_; 484 my ($self, $inlay) = @_;
816 485
817 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) 486 my $rules = $self->{rules};
818 for BLACK, WHITE;
819 487
820 sound::play 3, "gamestart"; 488 my $text = "";
821
822 my $text = "\n<header>Game Rules</header>";
823 489
824 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 490 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
825 491
826 $text .= "\nTime: "; 492 $text .= "\nTime: ";
827 493
829 $text .= "UNLIMITED"; 495 $text .= "UNLIMITED";
830 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 496 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
831 $text .= util::format_time $rules->{time}; 497 $text .= util::format_time $rules->{time};
832 $text .= " ABS"; 498 $text .= " ABS";
833 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 499 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
834 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 500 $text .= util::format_time $rules->{time};
835 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; 501 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
836 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 502 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
837 $text .= util::format_time $rules->{time}; 503 $text .= util::format_time $rules->{time};
838 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 504 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
839 } 505 }
840 506
841 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 507 $inlay->append_text ("<infoblock>$text</infoblock>");
508}
509
510sub event_update_rules {
511 my ($self, $rules) = @_;
512
513 $self->{rules} = $rules;
514
515 if ($self->{user}) {
516 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
517 for COLOUR_BLACK, COLOUR_WHITE;
518 }
519
520 sound::play 3, "gamestart";
521
522 $self->draw_rules ($self->{rules_inlay});
842} 523}
843 524
844sub inject_resign_game { 525sub inject_resign_game {
845 my ($self, $msg) = @_; 526 my ($self, $msg) = @_;
846 527
847 sound::play 3, "resign"; 528 sound::play 3, "resign";
848 529
849 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 530 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
850 . "\n<user>" 531 . "\n<user>"
851 . (util::toxml $self->{user}[$msg->{player}]->as_string) 532 . (util::toxml $self->{user}[$msg->{player}]->as_string)
852 . "</user> resigned.</infoblock>"); 533 . "</user> resigned.</infoblock>");
853} 534}
854 535
855sub inject_final_result { 536sub inject_final_result {
856 my ($self, $msg) = @_; 537 my ($self, $msg) = @_;
857 538
858 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 539 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
859 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 540 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
860 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 541 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
861 . "</infoblock>" 542 . "</infoblock>"
862 ); 543 );
863} 544}
864 545
865sub destroy { 546sub draw_challenge {
866 my ($self) = @_; 547 my ($self, $c) = @_;
867 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 548
868 for BLACK, WHITE; 549 my $inlay = $c->{inlay};
869 $self->SUPER::destroy; 550 my $challenge = $c->{challenge};
870 delete $appwin::gamelist->{game}{$self->{channel}}; 551 my $rules = $challenge->{rules};
552
553 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
554 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
555
556 $inlay->append_text ("\n<challenge>Challenge to <user>" . $opponent->as_string . "</user></challenge>");
557 $inlay->append_text ("\nHandicap: $rules->{handicap}");
558
559#bless( (
560# gametype => 3,
561# user1 => bless( {
562# flags => 2633,
563# name => 'dorkusx'
564# }, 'KGS::User' ),
565# rules => bless( {
566# count => 5,
567# time => 900,
568# timesys => 2,
569# interval => 30,
570# komi => '6.5',
571# size => 19,
572# ruleset => 0,
573# handicap => 0
574# }, 'KGS::Rules' ),
575# user2 => bless( {
576# flags => 436220808,
577# name => 'Nerdamus'
578# }, 'KGS::User' )
579# ), 'KGS::Challenge' )
580}
581
582sub draw_users {
583 my ($self, $inlay) = @_;
584
585 for (sort keys %{$self->{users}}) {
586 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
587 }
588}
589
590sub event_challenge {
591 my ($self, $challenge) = @_;
592
593 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
594 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
595
596 my $c = $self->{challenge}{$opponent->{name}} ||= {};
597
598 $c->{inlay} ||= $self->{chat}->new_inlay;
599 $c->{challenge} = $challenge;
600
601 $self->draw_challenge ($c);
602
603# require KGS::Listener::Debug;
604# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
871} 605}
872 606
8731; 6071;
874 608

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines