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.77 by pcg, Sat Aug 2 14:45:36 2003 UTC vs.
Revision 1.106 by root, Mon May 31 01:07:48 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 { "???" };
24}
22 25
26sub FINALIZE_INSTANCE {
27 my $self = shift;
28
23 $self; 29 $self->stop;
24} 30}
25 31
26sub configure { 32sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_; 33 my ($self, $timesys, $main, $interval, $count) = @_;
28 34
29 if ($timesys == TIMESYS_ABSOLUTE) { 35 if ($timesys == TIMESYS_ABSOLUTE) {
30 $self->{set} = sub { $self->{time} = $_[0] }; 36 $self->{format} = sub {
31 $self->{format} = sub { util::format_time $_[0] }; 37 if ($_[0] <= 0) {
38 "TIMEOUT";
39 } else {
40 util::format_time $_[0];
41 }
42 };
32 43
33 } elsif ($timesys == TIMESYS_BYO_YOMI) { 44 } elsif ($timesys == TIMESYS_BYO_YOMI) {
34 my $low = $interval * $count; 45 my $low = $interval * $count;
35 46
36 $self->{set} = sub { $self->{time} = $_[0] };
37
38 $self->{format} = sub { 47 $self->{format} = sub {
48 if ($_[0] <= 0) {
49 "TIMEOUT";
39 if ($_[0] > $low) { 50 } elsif ($_[0] > $low) {
40 util::format_time $_[0] - $low; 51 util::format_time $_[0] - $low;
41 } else { 52 } else {
42 sprintf "%s (%d)", 53 sprintf "%s (%d)",
43 util::format_time int (($_[0] - 1) % $interval + 1), 54 util::format_time int (($_[0] - 1) % $interval + 1),
44 ($_[0] - 1) / $interval; 55 ($_[0] - 1) / $interval;
45 } 56 }
46 }; 57 };
47 58
48 } elsif ($timesys == TIMESYS_CANADIAN) { 59 } elsif ($timesys == TIMESYS_CANADIAN) {
49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
50
51 $self->{format} = sub { 60 $self->{format} = sub {
61 if ($_[0] <= 0) {
62 "TIMEOUT";
52 if (!$self->{moves}) { 63 } elsif (!$self->{moves}) {
53 util::format_time $_[0] - $low; 64 util::format_time $_[0] - $low;
54 } else { 65 } else {
55 my $time = int (($_[0] - 1) % $interval + 1); 66 my $time = int (($_[0] - 1) % $interval + 1);
56 67
57 sprintf "%s/%d =%d", 68 sprintf "%s/%d =%d",
63 } 74 }
64 }; 75 };
65 76
66 } else { 77 } else {
67 # none, or unknown 78 # none, or unknown
68 $self->{set} = sub { };
69 $self->{format} = sub { "---" } 79 $self->{format} = sub { "-" }
70 } 80 }
71} 81}
72 82
73sub refresh { 83sub refresh {
74 my ($self, $timestamp) = @_; 84 my ($self, $timestamp) = @_;
75 my $timer = $self->{time} + $self->{start} - $timestamp; 85 my $timer = $self->{time} + $self->{start} - $timestamp;
76 86
77 # we round the timer value slightly... the protocol isn't exact anyways, 87 # we round the timer value slightly... the protocol isn't exact anyways,
78 # and this gives smoother timers ;) 88 # and this gives smoother timers ;)
79 my @format = $self->{format}->(int ($timer + 0.4)); 89 my $timer2 = int $timer + 0.4;
90
80 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); 91 $self->set_text ($self->{format}->($timer2));
81 92
82 $timer - int $timer; 93 $timer - int $timer;
83} 94}
84 95
85sub set_time { 96sub set_time {
86 my ($self, $time) = @_; 97 my ($self, $start, $time, $moves) = @_;
87 98
88 # we ignore requests to re-set the time of a running clock. 99 $self->{time} = $time;
89 # this is the easiest way to ensure that commentary etc. 100 $self->{moves} = $moves;
90 # doesn't re-set the clock. yes, this is frickle design, 101
91 # but I think the protocol is to blame here, which gives 102 if ($start) {
92 # very little time information. (cgoban2 also has had quite 103 $self->{start} = $start;
93 # a lot of small time update problems...) 104 $self->start;
94 unless ($self->{timeout}) { 105 } else {
95 $self->{set}->($time->[0], $time->[1]); 106 $self->stop;
96 $self->refresh ($self->{start}); 107 $self->refresh ($self->{start});
97 } 108 }
98} 109}
99 110
100sub start { 111sub start {
101 my ($self, $when) = @_; 112 my ($self) = @_;
102 113
103 $self->stop; 114 $self->stop;
104
105 $self->{start} = $when;
106 115
107 my $timeout; $timeout = sub { 116 my $timeout; $timeout = sub {
108 my $next = $self->refresh (Time::HiRes::time) * 1000; 117 my $next = $self->refresh (Time::HiRes::time) * 1000;
109 $next += 1000 if $next < 0; 118 $next += 1000 if $next < 0;
110 $self->{timeout} = add Glib::Timeout $next, $timeout; 119 $self->{timeout} = add Glib::Timeout $next, $timeout;
118 my ($self) = @_; 127 my ($self) = @_;
119 128
120 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 129 remove Glib::Source delete $self->{timeout} if $self->{timeout};
121} 130}
122 131
123sub destroy {
124 my ($self) = @_;
125 $self->stop;
126 $self->SUPER::destroy;
127}
128
129package game::userpanel; 132package game::userpanel;
130 133
131use base gtk::widget; 134use Glib::Object::Subclass
135 Gtk2::HBox,
136 properties => [
137 Glib::ParamSpec->IV ("colour", "colour", "User Colour", 0, 1, 0, [qw(construct-only writable)]),
138 ];
132 139
133sub new { 140sub INIT_INSTANCE {
134 my $class = shift; 141 my ($self) = @_;
135 my $self = $class->SUPER::new(@_);
136 142
137 $self->{widget} = new Gtk2::HBox;
138
139 $self->{widget}->add (my $vbox = new Gtk2::VBox); 143 $self->add (my $vbox = new Gtk2::VBox);
140 144
141 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 145 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
142 $vbox->add ($self->{info} = new Gtk2::Label ""); 146 $vbox->add ($self->{info} = new Gtk2::Label "");
143 $vbox->add (($self->{clock} = new game::goclock)->widget); 147 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock};
144 148
145 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 149 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
146 150
147 $self; 151 $self;
148} 152}
172 } 176 }
173 177
174 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); 178 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
175} 179}
176 180
177sub set_state { 181sub set_captures {
178 my ($self, $captures, $timer, $when) = @_; 182 my ($self, $captures) = @_;
179
180 $self->{clock}->stop unless $when;
181 $self->{clock}->set_time ($timer);
182 $self->{clock}->start ($when) if $when;
183 183
184 $self->{info}->set_text ("$captures pris."); 184 $self->{info}->set_text ("$captures pris.");
185} 185}
186 186
187sub set_timer {
188 my ($self, $start, $time, $moves) = @_;
189
190 $self->{clock}->set_time ($start, $time, $moves);
191}
192
187package game; 193package game;
194
195use Scalar::Util qw(weaken);
188 196
189use KGS::Constants; 197use KGS::Constants;
190use KGS::Game::Board; 198use KGS::Game::Board;
191 199
192use Gtk2::GoBoard; 200use Gtk2::GoBoard;
201use Gtk2::GoBoard::Constants;
193 202
203use base KGS::Game;
194use base KGS::Listener::Game; 204use base KGS::Listener::Game;
195use base KGS::Game;
196 205
197use base gtk::widget; 206use Glib::Object::Subclass
207 Gtk2::Window;
198 208
199use POSIX qw(ceil); 209use POSIX qw(ceil);
200 210
201sub new { 211sub new {
202 my $self = shift; 212 my ($self, %arg) = @_;
203 $self = $self->SUPER::new(@_); 213 $self = $self->Glib::Object::new;
214 $self->{$_} = delete $arg{$_} for keys %arg;
204 215
205 $self->listen($self->{conn});
206
207 $self->{window} = new Gtk2::Window 'toplevel';
208 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 216 gtk::state $self, "game::window", undef, window_size => [600, 500];
209 217
210 $self->{window}->signal_connect(delete_event => sub { 218 $self->signal_connect (destroy => sub {
211 $self->part; 219 $self->unlisten;
212 $self->destroy; 220 delete $self->{app}{game}{$self->{channel}};
213 1; 221 %{$_[0]} = ();
214 }); 222 });#d#
215 223
216 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 224 $self->add (my $hpane = new Gtk2::HPaned);
217 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 225 gtk::state $hpane, "game::hpane", undef, position => 500;
218 226
219 # LEFT PANE 227 # LEFT PANE
220 228
221 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 229 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
222 230
223 $self->{boardbox} = new Gtk2::VBox; 231 $self->{boardbox} = new Gtk2::VBox;
224 232
225 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 233 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
226 234
227 # challenge
228
229 $self->{challenge} = new challenge channel => $self->{channel};
230
231 # board box (aspect/canvas) 235 # board box (aspect/canvas)
232 236
233 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 237 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
238
239 # RIGHT PANE
240
241 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
242 $hpane->set (position_set => 1);
243
244 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
234 245
235 { 246 {
236 $frame->add (my $vbox = new Gtk2::VBox); 247 $frame->add (my $vbox = new Gtk2::VBox);
237 $vbox->add ($self->{title} = new Gtk2::Label $title); 248 $vbox->add ($self->{title} = new Gtk2::Label $title);
238 249
244 255
245 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); 256 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
246 $scale->set_draw_value (0); 257 $scale->set_draw_value (0);
247 $scale->set_digits (0); 258 $scale->set_digits (0);
248 259
249 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 260 $self->{moveadj}->signal_connect (value_changed => sub {
261 $self->{showmove} = int $self->{moveadj}->get_value;
262 $self->update_board;
263 });
250 } 264 }
251 265
252 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
253
254 # RIGHT PANE
255
256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1);
258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
259
260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
261 $sw->set_policy("automatic", "always");
262
263 $sw->add(($self->{userlist} = new userlist)->widget);
264
265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
266
267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 266 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
267
268 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 268 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
269 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 269 for COLOUR_WHITE, COLOUR_BLACK;
270
271 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
272
273 $buttonbox->add ($self->{button_pass} =
274 Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0));
275 $self->{button_pass}->signal_connect (clicked => sub {
276 $self->{board_click}->(255, 255) if $self->{board_click};
277 });
278 $buttonbox->add ($self->{button_undo} =
279 Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0));
280 $self->{button_undo}->signal_connect (clicked => sub {
281 $self->send (req_undo => channel => $self->{channel});
282 });
283 $buttonbox->add ($self->{button_resign} =
284 Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0));
285 $self->{button_resign}->signal_connect (clicked => sub {
286 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
287 });
270 288
271 $vbox->pack_start(($self->{chat} = new chat), 1, 1, 0); 289 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
272 290
273 $self->{chat}->signal_connect(command => sub { 291 $self->set_channel ($self->{channel});
274 my ($chat, $cmd, $arg) = @_;
275 if ($cmd eq "rsave") {
276 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
277 } else {
278 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
279 }
280 });
281 292
282 $self->event_update_game; 293 $self->show_all;
294
283 $self; 295 $self;
296}
297
298sub set_channel {
299 my ($self, $channel) = @_;
300
301 $self->{channel} = $channel;
302
303 if ($self->{channel} > 0) {
304 $self->listen ($self->{conn});
305
306 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
307 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
308
309 $self->signal_connect (delete_event => sub { $self->part; 1 });
310 $self->{chat}->signal_connect (command => sub {
311 my ($chat, $cmd, $arg) = @_;
312 if ($cmd eq "rsave") {
313 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
314 } else {
315 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
316 }
317 });
318 }
284} 319}
285 320
286sub event_update_users { 321sub event_update_users {
287 my ($self, $add, $update, $remove) = @_; 322 my ($self, $add, $update, $remove) = @_;
288 323
289 return unless $self->{userlist};
290
291 $self->{userlist}->update ($add, $update, $remove); 324# $self->{userlist}->update ($add, $update, $remove);
325
326 $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
327 for @$remove;
328
329 $self->{users_inlay}->refresh;
292 330
293 my %important; 331 my %important;
332 $important{$self->{black}{name}}++;
333 $important{$self->{white}{name}}++;
294 $important{$self->{user1}{name}}++; 334 $important{$self->{owner}{name}}++;
295 $important{$self->{user2}{name}}++;
296 $important{$self->{user3}{name}}++;
297 335
298 if (my @users = grep $important{$_->{name}}, @$add) { 336 if (my @users = grep $important{$_->{name}}, @$add) {
299 $self->{chat}->append_text ("\n<header>Joins:</header>"); 337 $self->{chat}->append_text ("\n<header>Joins:</header>");
300 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 338 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
301 } 339 }
302 if (my @users = grep $important{$_->{name}}, @$remove) { 340 if (my @users = grep $important{$_->{name}}, @$remove) {
303 $self->{chat}->append_text ("\n<header>Parts:</header>"); 341 $self->{chat}->append_text ("\n<header>Parts:</header>");
304 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 342 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
305 } 343 }
306
307} 344}
308 345
309sub join { 346sub join {
310 my ($self) = @_; 347 my ($self) = @_;
311 return if $self->{joined}; 348 return if $self->{joined};
312 349
313 $self->SUPER::join; 350 $self->SUPER::join;
314
315 $self->{window}->show_all;
316} 351}
317 352
318sub part { 353sub update_cursor {
354 my ($self) = @_;
355
356 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
357
358 delete $self->{board_click};
359
360 if ($self->{teacher} eq $self->{app}{conn}) {
361 #TODO# # teaching mode not implemented
362 $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1);
363 $self->{button_undo}->hide;
364 $self->{button_resign}->hide;
365 $self->{board}->set (cursor => undef);
366
367 } elsif ($running && $self->{colour} != COLOUR_NONE) {
368 # during game
369 $self->{button_undo}->show;
370 $self->{button_resign}->show;
371
372 if ($self->{cur_board}{score}) {
373 # during scoring
374 $self->{button_pass}->set (label => "Done", sensitive => 1, visible => 1);
375 $self->{board}->set (cursor => sub {
376 $_[0] & (MARK_B | MARK_W)
377 ? $_[0] ^ MARK_GRAYED
378 : $_[0];
379 });
380 $self->{board_click} = sub {
381 if ($_[0] == 255) {
382 $self->{button_pass}->sensitive (0);
383 $self->done;
384 } else {
385 $self->send (mark_dead =>
386 channel => $self->{channel},
387 x => $_[0],
388 y => $_[1],
389 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
390 );
391 }
392 };
393
394 } elsif ($self->{colour} == $self->{whosemove}) {
395 # normal move
396 $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1);
397 $self->{board}->set (cursor => sub {
398 # if is_valid_move oder so#TODO#
399 $_[0] & (MARK_B | MARK_W)
400 ? $_[0]
401 : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B);
402 });
403 $self->{board_click} = sub {
404 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
405 $self->{board}->set (cursor => undef);
406 delete $self->{board_click};
407 $self->{button_pass}->sensitive (0);
408 };
409 } else {
410 $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
411 $self->{board}->set (cursor => undef);
412 }
413 } else {
414 $self->{button_undo}->hide;
415 $self->{button_resign}->hide;
416 $self->{button_pass}->hide;
417 $self->{board}->set (cursor => undef);
418 #TODO# # implement coordinate-grabbing
419 }
420}
421
422sub update_timers {
319 my ($self) = @_; 423 my ($self, $timers) = @_;
320 424
321 $self->SUPER::part; 425 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
322 $self->destroy; 426
427 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
428 my $t = $timers->[$colour];
429 $self->{userpanel}[$colour]->set_timer (
430 $running && $colour == $self->{whosemove} && $t->[0],
431 $t->[1] || $self->{rules}{time}
432 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
433 && $self->{rules}{interval} * $self->{rules}{count}),
434 $t->[2] || $self->{rules}{count});
435 }
323} 436}
324 437
325sub update_board { 438sub update_board {
326 my ($self) = @_; 439 my ($self) = @_;
327 return unless $self->{path}; 440 return unless $self->{path};
328 441
329 my $move = int $self->{moveadj}->get_value;
330
331 my $running = $move == @{$self->{path}};
332
333 $self->{board_label}->set_text ("Move " . ($move - 1)); 442 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
334 443
335 $self->{cur_board} = new KGS::Game::Board $self->{size}; 444 $self->{cur_board} = new KGS::Game::Board $self->{size};
336 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 445 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
337 446
338 for my $colour (WHITE, BLACK) { 447 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
339 $self->{userpanel}[$colour]->set_state ( 448 for COLOUR_WHITE, COLOUR_BLACK;
340 $self->{cur_board}{captures}[$colour], 449
450 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
451 if ($self->{curnode}{move} == 0) {
452 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
453 } else {
454 $self->{whosemove} = 1 - $self->{cur_board}{last};
455 }
456 } else {
457 # Chinese, Aga, NZ all have manual placement
458 if ($self->{curnode}{move} < $self->{handicap}) {
459 $self->{whosemove} = COLOUR_BLACK;
460 } elsif ($self->{curnode}{move} == $self->{handicap}) {
461 $self->{whosemove} = COLOUR_WHITE;
462 } else {
463 $self->{whosemove} = 1 - $self->{cur_board}{last};
464 }
465 }
466
467 my $start_time = $self->{rules}{time};
468
469 if ($self->{showmove} == @{$self->{path}}) {
470 $self->{timers} = [
471 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
472 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
473 ];
474 $self->update_timers ($self->{timers});
475 } else {
476 $self->update_timers ([
341 $self->{cur_board}{timer}[$colour], 477 [0, @{$self->{cur_board}{timer}[0]}],
342 ($running && $self->{lastmove_colour} == !$colour) 478 [0, @{$self->{cur_board}{timer}[1]}],
343 ? $self->{lastmove_time} : 0
344 ); 479 ]);
345 } 480 }
346 481
347 $self->{board}->set_board ($self->{cur_board}); 482 $self->{board}->set_board ($self->{cur_board});
483
484 if ($self->{cur_board}{score}) {
485 $self->{score_inlay} ||= $self->{chat}->new_inlay;
486 $self->{score_inlay}->clear;
487 $self->{score_inlay}->append_text ("\n<header>Scoring</header>"
488 . "\n<score>"
489 . "White: $self->{cur_board}{score}[COLOUR_WHITE], "
490 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
491 . "</score>");
492 } elsif ($self->{score_inlay}) {
493 (delete $self->{score_inlay})->clear;
494 }
495
496 $self->update_cursor;
348} 497}
349 498
350sub event_update_tree { 499sub event_update_tree {
351 my ($self) = @_; 500 my ($self) = @_;
501
502 (delete $self->{undo_inlay})->clear
503 if $self->{undo_inlay};
352 504
353 $self->{path} = $self->get_path; 505 $self->{path} = $self->get_path;
354 506
355 if ($self->{moveadj}) { 507 if ($self->{moveadj}) {
356 my $upper = $self->{moveadj}->upper; 508 my $upper = $self->{moveadj}->upper;
404 $self->{chat}->append_text ($text); 556 $self->{chat}->append_text ($text);
405} 557}
406 558
407sub event_join { 559sub event_join {
408 my ($self) = @_; 560 my ($self) = @_;
561
409 $self->SUPER::event_join; 562 $self->SUPER::event_join (@_);
563 $self->init_tree;
564 $self->event_update_game;
410} 565}
411 566
412sub event_part { 567sub event_part {
413 my ($self) = @_; 568 my ($self) = @_;
569
414 $self->SUPER::event_part; 570 $self->SUPER::event_part;
415 $self->destroy; 571 $self->destroy;
416} 572}
417 573
418sub event_move { 574sub event_move {
420 sound::play 1, $pass ? "pass" : "move"; 576 sound::play 1, $pass ? "pass" : "move";
421} 577}
422 578
423sub event_update_game { 579sub event_update_game {
424 my ($self) = @_; 580 my ($self) = @_;
581
425 $self->SUPER::event_update_game; 582 $self->SUPER::event_update_game;
426 583
427 return unless $self->{window}; 584 return unless $self->{joined};
428 585
586 $self->{colour} = $self->player_colour ($self->{conn}{name});
587
429 my $title = defined $self->{channel} 588 my $title = defined $self->{channel}
430 ? $self->owner->as_string . " " . $self->opponent_string 589 ? $self->owner->as_string . " " . $self->opponent_string
431 : "Game Window"; 590 : "Game Window";
432 $self->{window}->set_title("KGS Game $title"); 591 $self->set_title ("KGS Game $title");
433 $self->{title}->set_text ($title); 592 $self->{title}->set_text ($title);
434 593
435 $self->{user}[BLACK] = $self->{user1}; 594 $self->{user}[COLOUR_BLACK] = $self->{black};
436 $self->{user}[WHITE] = $self->{user2}; 595 $self->{user}[COLOUR_WHITE] = $self->{white};
437 596
438 # show board 597 # show board
598 if ($self->is_inprogress) {
599 if (!$self->{boardbox}->parent) {
600 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
601 $self->{left}->add ($self->{boardbox});
602 $self->{board}->signal_connect (button_release => sub {
603 if ($_[1] == 1) {
604 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
605 }
606 });
607 }
608 if (my $ch = delete $self->{challenge}) {
609 $_->{inlay}->destroy for values %$ch;
610 }
611 $self->update_cursor;
612 }
613
614 $self->{left}->show_all;
615
616 $self->{rules_inlay}->refresh;
439 617
618}
619
620sub draw_setup {
621 my ($self, $inlay) = @_;
622
623 return unless $self->{joined};
624
625 my $rules = $self->{rules};
626
627 my $text = "";
628
629 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
630 if $self->{teacher};
631
632 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
633 if $self->{owner}->is_valid;
634
440 if ($self->is_valid) { 635 if ($self->is_inprogress) {
441 #D# TODO: check wether already inside, or already removed!!!
442 $self->{left}->add ($self->{boardbox});
443 $self->{left}->remove ($self->{challenge}->widget) if $self->{challenge};
444 } else {
445 #D# TODO: check wether already inside, or already removed!!!
446 $self->{left}->add ($self->{challenge}->widget);
447 $self->{left}->remove ($self->{boardbox});
448 }
449 $self->{left}->show_all;
450
451 # view text
452
453 eval { #d#
454 my @ga;
455 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
456 . " (" . (util::toxml $gameopt{$self->option}) . ")";
457 $ga[1] = "\nFlags:";
458 $ga[1] .= " valid" if $self->is_valid;
459 $ga[1] .= " adjourned" if $self->is_adjourned;
460 $ga[1] .= " scored" if $self->is_scored;
461 $ga[1] .= " saved" if $self->is_saved;
462
463 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
464
465 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 636 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
466 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 637 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
467 if $self->is_valid;
468
469 if ($self->is_valid) {
470 $ga[4] = "\nHandicap: " . $self->{handicap};
471 $ga[5] = "\nKomi: " . $self->{komi};
472 $ga[6] = "\nSize: " . $self->size_string;
473 }
474
475 if ($self->is_scored) {
476 $ga[7] = "\nResult: " . $self->score_string;
477 }
478
479 $text = "\n<infoblock><header>Game Update</header>";
480 for (0..7) {
481 if ($self->{gatext}[$_] ne $ga[$_]) {
482 $text .= $ga[$_];
483 }
484 }
485 $text .= "</infoblock>";
486
487 $self->{gatext} = \@ga;
488 }; 638 }
489 639 $text .= "\nType: " . util::toxml $gametype{$self->type};
490 $self->{chat}->append_text ($text);
491}
492
493sub event_update_rules {
494 my ($self, $rules) = @_;
495
496 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
497 for BLACK, WHITE;
498
499 sound::play 3, "gamestart";
500
501 my $text = "\n<header>Game Rules</header>";
502 640
503 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 641 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
504 642
505 $text .= "\nTime: "; 643 $text .= "\nTime: ";
506 644
508 $text .= "UNLIMITED"; 646 $text .= "UNLIMITED";
509 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 647 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
510 $text .= util::format_time $rules->{time}; 648 $text .= util::format_time $rules->{time};
511 $text .= " ABS"; 649 $text .= " ABS";
512 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 650 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
513 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 651 $text .= util::format_time $rules->{time};
514 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; 652 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
515 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 653 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
516 $text .= util::format_time $rules->{time}; 654 $text .= util::format_time $rules->{time};
517 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 655 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
518 } 656 }
519 657
658 $text .= "\nFlags:";
659 $text .= " private" if $self->is_private;
660 $text .= " started" if $self->is_inprogress;
661 $text .= " adjourned" if $self->is_adjourned;
662 $text .= " scored" if $self->is_scored;
663 $text .= " saved" if $self->is_saved;
664
665 if ($self->is_inprogress) {
666 $text .= "\nHandicap: " . $self->{handicap};
667 $text .= "\nKomi: " . $self->{komi};
668 $text .= "\nSize: " . $self->size_string;
669 }
670
671 if ($self->is_scored) {
672 $text .= "\nResult: " . $self->score_string;
673 }
674
520 $self->{chat}->append_text ("<infoblock>$text</infoblock>"); 675 $inlay->append_text ("<infoblock>$text</infoblock>");
521}
522 676
523sub inject_resign_game { 677}
678
679sub event_update_rules {
524 my ($self, $msg) = @_; 680 my ($self, $rules) = @_;
681
682 $self->{rules} = $rules;
683
684 if ($self->{user}) {
685 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
686 for COLOUR_BLACK, COLOUR_WHITE;
687 }
688
689 sound::play 3, "gamestart";
690
691 $self->{rules_inlay}->refresh;
692}
693
694sub event_resign_game {
695 my ($self, $player) = @_;
525 696
526 sound::play 3, "resign"; 697 sound::play 3, "resign";
527
528 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 698 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
529 . "\n<user>" 699 . "\n<user>"
530 . (util::toxml $self->{user}[$msg->{player}]->as_string) 700 . (util::toxml $self->{user}[$msg->{player}]->as_string)
531 . "</user> resigned.</infoblock>"); 701 . "</user> resigned.</infoblock>");
702}
703
704sub event_out_of_time {
705 my ($self, $player) = @_;
706
707 sound::play 3, "timewin";
708 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
709 . "\n<user>"
710 . (util::toxml $self->{user}[$msg->{player}]->as_string)
711 . "</user> ran out of time and lost.</infoblock>");
712}
713
714sub event_done {
715 my ($self) = @_;
716
717 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
718 $self->{chat}->append_text ("\n<infoblock><header>Done</header>"
719 . "\nYour opponent pressed done.");
720 }
532} 721}
533 722
534sub inject_final_result { 723sub inject_final_result {
535 my ($self, $msg) = @_; 724 my ($self, $msg) = @_;
536 725
539 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 728 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
540 . "</infoblock>" 729 . "</infoblock>"
541 ); 730 );
542} 731}
543 732
733sub inject_set_gametime {
734 my ($self, $msg) = @_;
735
736 $self->{timers} = [
737 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
738 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
739 ];
740
741 $self->update_timers ($self->{timers})
742 if $self->{showmove} == @{$self->{path}};
743}
744
745sub inject_req_undo {
746 my ($self, $msg) = @_;
747
748 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
749 return if $inlay->{ignore};
750
751 sound::play 3, "warning" unless $inlay->{count};
752 $inlay->{count}++;
753
754 $inlay->clear;
755 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
756 $inlay->append_button ("Grant", sub {
757 (delete $self->{undo_inlay})->clear;
758 $self->send (grant_undo => channel => $self->{channel});
759 });
760 $inlay->append_button ("Ignore", sub {
761 $inlay->clear;
762 $inlay->{ignore} = 1;
763 # but leave inlay, so further undo requests get counted
764 });
765
766 $self->{chat}->set_end;
767}
768
769sub inject_new_game {
770 my ($self, $msg) = @_;
771
772 $self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>");
773 delete $self->{cid};
774}
775
776sub draw_challenge {
777 my ($self, $id) = @_;
778
779 my $info = $self->{challenge}{$id};
780 my $inlay = $info->{inlay};
781 my $rules = $info->{rules};
782
783 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
784 my $opponent = $as_black ? $info->{white} : $info->{black};
785
786 my ($size, $time, $interval, $count, $type);
787
788 if (!$self->{channel}) {
789 $inlay->append_text ("\nNotes: ");
790 $inlay->append_entry (\$info->{notes}, 20, "");
791 $inlay->append_text ("\nGlobal Offer: ");
792 $inlay->append_optionmenu (\$info->{flags},
793 0 => "No",
794 2 => "Yes",
795 );
796 } else {
797 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
798 }
799
800 $inlay->append_text ("\nType: ");
801 $type = $inlay->append_optionmenu (
802 \$info->{gametype},
803 GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
804 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
805 GAMETYPE_TEACHING , "Teaching (not yet)",
806 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
807 GAMETYPE_SIMUL , "Simul (not yet!)",
808 GAMETYPE_FREE , "Free",
809 GAMETYPE_RATED , "Rated",
810 sub {
811 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
812 },
813 );
814
815 if ($self->{channel}) {
816 $inlay->append_text ("\nMy Colour: ");
817 $inlay->append_optionmenu (
818 \$as_black,
819 0 => "White",
820 1 => "Black",
821 sub {
822 if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
823 ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
824 }
825 }
826 );
827 }
828
829 $inlay->append_text ("\nRuleset: ");
830 $inlay->append_optionmenu (
831 \$info->{rules}{ruleset},
832 RULESET_JAPANESE , "Japanese",
833 RULESET_CHINESE , "Chinese",
834 RULESET_AGA , "AGA",
835 RULESET_NEW_ZEALAND, "New Zealand",
836 );
837
838 $inlay->append_text ("\nSize: ");
839 $size = $inlay->append_optionmenu (
840 \$info->{rules}{size},
841 (9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38),
842 sub {
843 $type->set_history (5) # reset to free
844 if $_[0] != 19 && $info->{gametype} == GAMETYPE_RATED;
845 },
846 );
847
848 if ($self->{channel}) {
849 $inlay->append_text ("\nHandicap: ");
850 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
851
852 $inlay->append_text ("\nKomi: ");
853 $inlay->append_entry (\$info->{rules}{komi}, 5);
854 }
855
856 $inlay->append_text ("\nTimesys: ");
857 $inlay->append_optionmenu (
858 \$info->{rules}{timesys},
859 &TIMESYS_NONE => "None",
860 &TIMESYS_ABSOLUTE => "Absolute",
861 &TIMESYS_BYO_YOMI => "Byo Yomi",
862 &TIMESYS_CANADIAN => "Canadian",
863 sub {
864 my ($new) = @_;
865
866 if ($new eq TIMESYS_NONE) {
867 $time->hide;
868 $interval->hide;
869 $count->hide;
870 } else {
871 $time->show;
872 $time->set_text ($self->{app}{defaults}{time});
873 if ($new eq TIMESYS_ABSOLUTE) {
874 $interval->hide;
875 $count->hide;
876 } else {
877 $interval->show;
878 $count->show;
879 if ($new eq TIMESYS_BYO_YOMI) {
880 $interval->set_text ($self->{app}{defaults}{byo_time});
881 $count->set_text ($self->{app}{defaults}{byo_period});
882 } elsif ($new eq TIMESYS_CANADIAN) {
883 $interval->set_text ($self->{app}{defaults}{can_time});
884 $count->set_text ($self->{app}{defaults}{can_period});
885 }
886 }
887 }
888 }
889 );
890
891 $inlay->append_text ("\nMain Time: ");
892 $time = $inlay->append_entry (\$info->{rules}{time}, 5);
893 $inlay->append_text ("\nInterval: ");
894 $interval = $inlay->append_entry (\$info->{rules}{interval}, 3);
895 $inlay->append_text ("\nPeriods/Stones: ");
896 $count = $inlay->append_entry (\$info->{rules}{count}, 2);
897
898 $inlay->append_text ("\n");
899
900 if (!$self->{channel}) {
901 $inlay->append_button ("Create Challenge", sub {
902 $inlay->clear;
903 $self->{cid} = $self->{conn}->alloc_clientid;
904 $self->send (new_game =>
905 channel => delete $self->{roomid},
906 gametype => $info->{gametype},
907 cid => $self->{cid},
908 flags => $info->{flags},
909 rules => $info->{rules},
910 notes => $info->{notes},
911 );
912 });
913 } else {
914 $inlay->append_button ("OK", sub {
915 $inlay->clear;
916 $self->send (challenge =>
917 channel => $self->{channel},
918 black => $info->{black},
919 white => $info->{white},
920 gametype => $info->{gametype},
921 cid => $info->{cid},
922 rules => $info->{rules},
923 );
924 });
925 if (exists $self->{challenge}{""}) {
926 $inlay->append_button ("Reject", sub {
927 $inlay->clear;
928 $self->send (reject_challenge =>
929 channel => $self->{channel},
930 name => $opponent->{name},
931 gametype => $info->{gametype},
932 cid => $info->{cid},
933 rules => $info->{rules},
934 );
935 });
936 }
937 }
938}
939
940sub draw_users {
941 my ($self, $inlay) = @_;
942
943 for (sort keys %{$self->{users}}) {
944 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
945 }
946}
947
544sub event_challenge { 948sub event_challenge {
545 my ($self, $challenge) = @_;
546
547 use KGS::Listener::Debug;
548 $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
549}
550
551sub destroy {
552 my ($self) = @_; 949 my ($self, $info) = @_;
553 950
554 delete $self->{app}{gamelist}{game}{$self->{channel}}; 951 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
555 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 952 my $opponent = $as_black ? $info->{white} : $info->{black};
556 for BLACK, WHITE; 953
557 $self->SUPER::destroy; 954 my $id = $opponent->{name};
955
956 $self->{challenge}{$id} = $info;
957 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
958 exists $self->{challenge}{""}
959 ? "Challenge from $opponent->{name}"
960 : "Challenge to $opponent->{name}",
961 sub {
962 $self->{challenge}{$id}{inlay} = $_[0];
963 $self->draw_challenge ($id);
964 },
965 !exists $self->{challenge}{""} # only open when not offerer
966 );
558} 967}
559 968
5601; 9691;
561 970

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines