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.57 by pcg, Sat Jun 14 11:53:24 2003 UTC vs.
Revision 1.90 by pcg, Fri May 21 17:24:02 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
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
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);
234 233
234 $vbox->add (my $hbox = new Gtk2::HBox);
235
236 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
237
235 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 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) 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 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 my $area = $event->area;
337
338 $self->redraw ($area);
339
340 0;
341}
342
343# something Gtk2 fixed
344sub INTERP_NEAREST (){ 'nearest' }
345sub INTERP_TILES (){ 'tiles' }
346sub INTERP_BILINEAR (){ 'bilinear' }
347sub INTERP_HYPER (){ 'hyper' }
348
349sub new_pixbuf {
350 my ($w, $h, $alpha, $fill) = @_;
351
352 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
353 $pixbuf->fill ($fill) if defined $fill;
354
355 $pixbuf;
356}
357
358sub scale_pixbuf {
359 my ($src, $w, $h, $mode) = @_;
360
361 my $dst = new_pixbuf $w, $h, 1;
362
363 $src->scale(
364 $dst, 0, 0, $w, $h, 0, 0,
365 $w / $src->get_width, $h / $src->get_height,
366 $mode,
367 );
368
369 $dst;
370}
371
372# create a stack of stones
373sub create_stack {
374 my ($self, $mark, $size, $rand) = @_;
375
376 my $shadow = $size * 0.05;
377
378 my $c = \$self->{stack}{$mark};
379 unless ($$c) {
380 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
381 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
382
383 # zeroeth the shadow
384 if ($mark & (MARK_B | MARK_W)) {
385 # the -0.5's are a mystery to me
386 $::shadow_img->composite (
387 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
388 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
389 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
390 );
391 }
392
393 # first the big stones (handicap stones could be different)
394 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
395 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
396 [MARK_GRAY_B, 128],
397 [MARK_GRAY_W, 128]) {
398 my ($mask, $alpha) = @$_;
399 if ($mark & $mask) {
400 $stone->composite (
401 $base, 0, 0, $size, $size, 0, 0,
402 $size / $stone->get_width, $size / $stone->get_height,
403 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
404 );
405 }
406 }
407
408 # then the small stones
409 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
410 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
411 my ($mask, $img) = @$_;
412 if ($mark & $mask) {
413 $img->composite (
414 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
415 $size / $img->get_width / 2, $size / $img->get_height / 2,
416 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
417 );
418 }
419 }
420
421 # and lastly any markers
422 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
423
424 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
425 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
426 [MARK_SQUARE, $::square_img[$dark_bg]]) {
427 my ($mask, $img) = @$_;
428 if ($mark & $mask) {
429 $img->composite (
430 $base, 0, 0, $size, $size, 0, 0,
431 $size / $img->get_width, $size / $img->get_height,
432 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
433 );
434 }
435 }
436
437 push @$$c, $base;
438 }
439 }
440
441 $$c->[$rand % @$$c];
442}
443
444sub pixbuf_text {
445 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
446
447 my @c = grep $_,
448 map $::font[$colour][$::fontmap{$_}],
449 split //, $text;
450
451 if (@c) {
452 my $spacing = $height * 0.1;
453 my $s = $height / List::Util::max map $_->get_height, @c;
454 my $W = List::Util::sum map $_->get_width, @c;
455
456 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
457 $y -= $height * 0.5;
458
459 for (@c) {
460 my $w = $_->get_width * $s;
461 # +2 == don't fight the rounding
462 $_->composite ($pixbuf,
463 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
464 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
465
466 $x += $w + $spacing;
467 }
468 }
469}
470
471sub pixbuf_rect {
472 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
473 # we fake lines by... a horrible method :/
474 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
475 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
476 INTERP_NEAREST, $alpha);
477}
478
479sub repaint_board {
480 my ($self) = @_;
481 my $canvas = $self->{canvas};
482 my $expose_area = undef;
483
484 return $expose_area unless $self->{board};
485
486 my ($w, $h) = ($canvas->allocation->values)[2,3];
487
488 die "FATAL: board aspect ratio != 1" unless $w == $h;
489
490 my $s = $w;
491
492 return unless $s >= 200;
493
494 my $size = $self->{size};
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
498 my $border = int ($s / ($size + 3) * 0.5);
499 my $s2 = $s - $border * 2;
500 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
501 my $ofs = int ($edge / 2);
502
503 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
504
505 my $pixbuf;
506
507 my $oldboard;
508
509 if ($self->{background}) {
510 if ($oldboard = $self->{board_shown}) {
511 $pixbuf = $self->{pixbuf};
512 } else {
513 $pixbuf = $self->{background}->copy;
514 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
515 }
516 } else {
517 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
518
519 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
520
521 if ($s < $bw && $s < $bh) {
522 $pixbuf = new_pixbuf $s, $s, 0;
523 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
524 } else {
525 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
526 }
527
528 my $linew = int ($s / 40 / $size);
529
530 # ornamental border... we have time to waste :/
531 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
532 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
533 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
534 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
535
536 for my $i (1 .. $size) {
537 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
538 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
539
540 # 38 max, but we allow a bit more
541 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
542 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];
543
544 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
545 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
546 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
547 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
548
549 $a++;
550 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
551 }
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
584 unless ($::config->{conserve_memory} > 1) {
585 $self->{background} = $pixbuf;
586 $pixbuf = $pixbuf->copy;
587 }
588 }
589
590 $self->{pixbuf} = $pixbuf;
591
592 for my $x (1 .. $size) {
593 for my $y (1 .. $size) {
594 my $rand = ($x ^ $y ^ 0x5555);
595
596 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
597
598 if ($::config->{randomize}) {
599 $dx += ($rand % 7) - 3;
600 $dy += ($rand / 3 % 7) - 3;
601 }
602
603 my $shadow = $edge * 0.05;
604 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
605
606 my $mark = $self->{board}{board}[$x-1][$y-1];
607 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
608
609 if ($oldboard) {
610 next if $old == $mark; # no change
611
612 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
613 $expose_area = $expose_area
614 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
615 : new Gtk2::Gdk::Rectangle @$area;
616 }
617
618 if ($mark) {
619 my $pb = $self->create_stack($mark, $edge, $rand);
620
621 $pb->composite ($pixbuf, @$area,
622 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
623
624 # labels are handled here because they are quite rare
625 if ($mark & MARK_LABEL) {
626 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
627
628 if ($white) {
629 pixbuf_text $pixbuf, 0,
630 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
631 $self->{board}{label}[$x-1][$y-1];
632 }
633 pixbuf_text $pixbuf, $white,
634 $k[$x], $k[$y], $ofs * 0.7,
635 $self->{board}{label}[$x-1][$y-1];
636 }
637 }
638 }
639 }
640
641 $self->{board_shown} = Storable::dclone $self->{board};
642 #d# save
643 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
644
645 $expose_area;
646}
647
648sub redraw {
649 my ($self, $area) = @_;
650
651 if ($area && $self->{pixbuf}) {
652 my ($x, $y, $w, $h) = $area->values;
653
654 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
655 $x, $y, $x, $y, $w, $h,
656 "normal", 0, 0);
657 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
658 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
659 }
660} 311}
661 312
662sub update_board { 313sub update_board {
663 my ($self) = @_; 314 my ($self) = @_;
664 return unless $self->{path}; 315 return unless $self->{path};
665 316
666 #$self->{update_board_cb} ||= add Glib::Idle sub {
667 my $move = int $self->{moveadj}->get_value; 317 my $move = int $self->{moveadj}->get_value;
668 318
669 my $running = $move == @{$self->{path}}; 319 my $running = $move == @{$self->{path}};
670 320
671 $self->{board_label}->set_text ("Move " . ($move - 1)); 321 $self->{board_label}->set_text ("Move " . ($move - 1));
672 322
673 $self->{board} = new KGS::Game::Board $self->{size}; 323 $self->{cur_board} = new KGS::Game::Board $self->{size};
674 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 324 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
675 325
676 for my $colour (WHITE, BLACK) { 326 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
677 $self->{userpanel}[$colour]->set_state ( 327 $self->{userpanel}[$colour]->set_state (
678 $self->{board}{captures}[$colour], 328 $self->{cur_board}{captures}[$colour],
679 $self->{board}{timer}[$colour], 329 $self->{cur_board}{timer}[$colour],
680 ($running && $self->{lastmove_colour} == !$colour) 330 ($running && $self->{lastmove_colour} == !$colour)
681 ? $self->{lastmove_time} : 0 331 ? $self->{lastmove_time} : 0
682 ); 332 );
683 }
684
685 $self->redraw ($self->repaint_board);
686
687 # delete $self->{update_board_cb};
688 #} 333 }
334
335 $self->{board}->set_board ($self->{cur_board});
689} 336}
690 337
691sub event_update_tree { 338sub event_update_tree {
692 my ($self) = @_; 339 my ($self) = @_;
693 340
740 }sgexi; 387 }sgexi;
741 388
742 $text .= $_; 389 $text .= $_;
743 } 390 }
744 391
745 $self->{text}->append_text ($text); 392 $self->{chat}->append_text ($text);
746} 393}
747 394
748sub event_join { 395sub event_join {
749 my ($self) = @_; 396 my ($self) = @_;
397
750 $self->SUPER::event_join; 398 $self->SUPER::event_join (@_);
399 $self->event_update_game;
400 $self->show_all;
751} 401}
752 402
753sub event_part { 403sub event_part {
754 my ($self) = @_; 404 my ($self) = @_;
405
755 $self->SUPER::event_part; 406 $self->SUPER::event_part;
756 $self->destroy; 407 $self->destroy;
757} 408}
758 409
759sub event_move { 410sub event_move {
763 414
764sub event_update_game { 415sub event_update_game {
765 my ($self) = @_; 416 my ($self) = @_;
766 $self->SUPER::event_update_game; 417 $self->SUPER::event_update_game;
767 418
768 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";
769 $self->{window}->set_title("KGS Game $title"); 424 $self->set_title("KGS Game $title");
770 $self->{title}->set_text ($title); 425 $self->{title}->set_text ($title);
771 426
772 $self->{user}[BLACK] = $self->{user1}; 427 $self->{user}[COLOUR_BLACK] = $self->{user1};
773 $self->{user}[WHITE] = $self->{user2}; 428 $self->{user}[COLOUR_WHITE] = $self->{user2};
774 429
775 # 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 }
776 436 }
777 $self->{left}->remove ($_) for $self->{left}->get_children; 437
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; 438 $self->{left}->show_all;
785 439
786 # view text 440 # view text
787 441
442 eval { #d#
788 my @ga; 443 my @ga;
789 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) 444 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
790 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 445 . " (" . (util::toxml $gameopt{$self->option}) . ")";
791 $ga[1] = "\nFlags:"; 446 $ga[1] = "\nFlags:";
792 $ga[1] .= " valid" if $self->is_valid; 447 $ga[1] .= " started" if $self->is_inprogress;
793 $ga[1] .= " adjourned" if $self->is_adjourned; 448 $ga[1] .= " adjourned" if $self->is_adjourned;
794 $ga[1] .= " scored" if $self->is_scored; 449 $ga[1] .= " scored" if $self->is_scored;
795 $ga[1] .= " saved" if $self->is_saved; 450 $ga[1] .= " saved" if $self->is_saved;
796 451
797 $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;
798 454
799 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 455 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
800 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 456 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
801 if $self->is_valid; 457 if $self->is_inprogress;
802 458
803 if ($self->is_valid) { 459 if ($self->is_inprogress) {
804 $ga[4] = "\nHandicap: " . $self->{handicap}; 460 $ga[4] = "\nHandicap: " . $self->{handicap};
805 $ga[5] = "\nKomi: " . $self->{komi}; 461 $ga[5] = "\nKomi: " . $self->{komi};
806 $ga[6] = "\nSize: " . $self->size_string; 462 $ga[6] = "\nSize: " . $self->size_string;
807 } 463 }
808 464
817 } 473 }
818 } 474 }
819 $text .= "</infoblock>"; 475 $text .= "</infoblock>";
820 476
821 $self->{gatext} = \@ga; 477 $self->{gatext} = \@ga;
478 };
822 479
823 $self->{text}->append_text ($text); 480 $self->{chat}->append_text ($text);
824} 481}
825 482
826sub event_update_rules { 483sub draw_rules {
827 my ($self, $rules) = @_; 484 my ($self, $inlay) = @_;
828 485
829 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) 486 my $rules = $self->{rules};
830 for BLACK, WHITE;
831 487
832 sound::play 3, "gamestart"; 488 my $text = "";
833
834 my $text = "\n<header>Game Rules</header>";
835 489
836 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 490 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
837 491
838 $text .= "\nTime: "; 492 $text .= "\nTime: ";
839 493
841 $text .= "UNLIMITED"; 495 $text .= "UNLIMITED";
842 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 496 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
843 $text .= util::format_time $rules->{time}; 497 $text .= util::format_time $rules->{time};
844 $text .= " ABS"; 498 $text .= " ABS";
845 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 499 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
846 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 500 $text .= util::format_time $rules->{time};
847 $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};
848 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 502 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
849 $text .= util::format_time $rules->{time}; 503 $text .= util::format_time $rules->{time};
850 $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};
851 } 505 }
852 506
853 $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->{rules_inlay}->refresh;
854} 523}
855 524
856sub inject_resign_game { 525sub inject_resign_game {
857 my ($self, $msg) = @_; 526 my ($self, $msg) = @_;
858 527
859 sound::play 3, "resign"; 528 sound::play 3, "resign";
860 529
861 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 530 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
862 . "\n<user>" 531 . "\n<user>"
863 . (util::toxml $self->{user}[$msg->{player}]->as_string) 532 . (util::toxml $self->{user}[$msg->{player}]->as_string)
864 . "</user> resigned.</infoblock>"); 533 . "</user> resigned.</infoblock>");
865} 534}
866 535
867sub inject_final_result { 536sub inject_final_result {
868 my ($self, $msg) = @_; 537 my ($self, $msg) = @_;
869 538
870 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 539 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
871 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 540 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
872 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 541 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
873 . "</infoblock>" 542 . "</infoblock>"
874 ); 543 );
875} 544}
876 545
877sub destroy { 546sub draw_challenge {
878 my ($self) = @_; 547 my ($self, $c) = @_;
879 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 548
880 for BLACK, WHITE; 549 my $inlay = $c->{inlay};
881 $self->SUPER::destroy; 550 my $challenge = $c->{challenge};
882 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));
883} 605}
884 606
8851; 6071;
886 608

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines