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.36 by pcg, Tue Jun 3 07:35:08 2003 UTC vs.
Revision 1.100 by pcg, Sun May 30 03:24:47 2004 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines