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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines