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.89 by pcg, Fri May 21 17:15:33 2004 UTC vs.
Revision 1.140 by root, Wed Oct 13 00:33:15 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines