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.68 by pcg, Mon Jul 21 01:41:02 2003 UTC vs.
Revision 1.105 by pcg, Sun May 30 07:37:28 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines