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.105 by pcg, Sun May 30 07:37:28 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] };
31 $self->{format} = sub { 38 $self->{format} = sub {
32 if ($_[0] <= 0) { 39 if ($_[0] < 0) {
33 "TIMEOUT"; 40 "TIMEOUT";
34 } else { 41 } else {
35 util::format_time $_[0]; 42 util::format_time $_[0];
36 } 43 }
37 }; 44 };
38 45
39 } elsif ($timesys == TIMESYS_BYO_YOMI) { 46 } elsif ($timesys == TIMESYS_BYO_YOMI) {
40 my $low = $interval * $count; 47 my $low = $interval * $count;
41 48
42 $self->{set} = sub { $self->{time} = $_[0] };
43
44 $self->{format} = sub { 49 $self->{format} = sub {
45 if ($_[0] <= 0) { 50 if ($_[0] < 0) {
46 "TIMEOUT"; 51 "TIMEOUT";
47 } elsif ($_[0] > $low) { 52 } elsif ($_[0] > $low) {
48 util::format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
49 } else { 54 } else {
50 sprintf "%s (%d)", 55 sprintf "%s (%d)",
… …
52 ($_[0] - 1) / $interval; 57 ($_[0] - 1) / $interval;
53 } 58 }
54 }; 59 };
55 60
56 } elsif ($timesys == TIMESYS_CANADIAN) { 61 } elsif ($timesys == TIMESYS_CANADIAN) {
57 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
58
59 $self->{format} = sub { 62 $self->{format} = sub {
60 if ($_[0] <= 0) { 63 if ($_[0] < 0) {
61 "TIMEOUT"; 64 "TIMEOUT";
62 } elsif (!$self->{moves}) { 65 } elsif (!$self->{moves}) {
63 util::format_time $_[0] - $low; 66 util::format_time $_[0] - $low;
64 } else { 67 } else {
65 my $time = int (($_[0] - 1) % $interval + 1); 68 my $time = int (($_[0] - 1) % $interval + 1);
… …
73 } 76 }
74 }; 77 };
75 78
76 } else { 79 } else {
77 # none, or unknown 80 # none, or unknown
78 $self->{set} = sub { };
79 $self->{format} = sub { "-" } 81 $self->{format} = sub { "-" }
80 } 82 }
81} 83}
82 84
83sub refresh { 85sub refresh {
… …
92 94
93 $timer - int $timer; 95 $timer - int $timer;
94} 96}
95 97
96sub set_time { 98sub set_time {
97 my ($self, $time, $moves) = @_; 99 my ($self, $start, $time, $moves) = @_;
98 100
99 # we ignore requests to re-set the time of a running clock. 101 $self->{time} = $time;
100 # this is the easiest way to ensure that commentary etc. 102 $self->{moves} = $moves;
101 # doesn't re-set the clock. yes, this is frickle design, 103
102 # but I think the protocol is to blame here, which gives 104 if ($start) {
103 # very little time information. (cgoban2 also has had quite 105 $self->{start} = $start;
104 # a lot of small time update problems...) 106 $self->start;
105 unless ($self->{timeout}) { 107 } else {
106 $self->{set}->($time, $moves); 108 $self->stop;
107 $self->refresh ($self->{start}); 109 $self->refresh ($self->{start});
108 } 110 }
109} 111}
110 112
111sub start { 113sub start {
112 my ($self, $when) = @_; 114 my ($self) = @_;
113 115
114 $self->stop; 116 $self->stop;
115
116 $self->{start} = $when;
117 117
118 my $timeout; $timeout = sub { 118 my $timeout; $timeout = sub {
119 my $next = $self->refresh (Time::HiRes::time) * 1000; 119 my $next = $self->refresh (Time::HiRes::time) * 1000;
120 $next += 1000 if $next < 0; 120 $next += 1000 if $next < 0;
121 $self->{timeout} = add Glib::Timeout $next, $timeout; 121 $self->{timeout} = add Glib::Timeout $next, $timeout;
… …
129 my ($self) = @_; 129 my ($self) = @_;
130 130
131 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 131 remove Glib::Source delete $self->{timeout} if $self->{timeout};
132} 132}
133 133
134### USER PANEL ##############################################################
135
134package game::userpanel; 136package game::userpanel;
135 137
138use KGS::Constants;
139
136use Glib::Object::Subclass 140use Glib::Object::Subclass
137 Gtk2::HBox, 141 Gtk2::Frame,
138 properties => [ 142 properties => [
139 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)]),
140 ]; 146 ];
141 147
142sub INIT_INSTANCE { 148sub INIT_INSTANCE {
143 my ($self) = @_; 149 my ($self) = @_;
144 150
151 $self->add ($self->{window} = my $window = new Gtk2::EventBox); # for bg
152
145 $self->add (my $vbox = new Gtk2::VBox); 153 $window->add (my $vbox = new Gtk2::VBox);
146 154
147 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 155 $vbox->pack_start (($self->{name} = new Gtk2::Label "-"), 1, 1, 0);
148 $vbox->add ($self->{info} = new Gtk2::Label ""); 156 $vbox->pack_start (($self->{info} = new Gtk2::Label "-"), 1, 1, 0);
149 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock}; 157 $vbox->pack_start (($self->{clock} = new game::goclock), 1, 1, 0);
150 158
151 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 159 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
152 160
153 $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}");
154} 170}
155 171
156sub configure { 172sub configure {
157 my ($self, $app, $user, $rules) = @_; 173 my ($self, $app, $user, $rules) = @_;
158 174
159 if ($self->{name}->get_text ne $user->as_string) { 175 if ($self->{name}->get_text ne $user->as_string) {
160 $self->{name}->set_text ($user->as_string); 176 $self->{name}->set_text ($user->as_string);
161 177
162 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 178 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
179 unless ($::config{suppress_userpic}) {
163 $self->{imagebox}->add (gtk::image_from_data undef); 180 $self->{imagebox}->add (gtk::image_from_data undef);
181 }
164 $self->{imagebox}->show_all; 182 $self->{imagebox}->show_all;
165 183
166 if ($user->has_pic) { 184 if ($user->has_pic) {
167 # the big picture... 185 # the big picture...
168 $app->userpic ($user->{name}, sub { 186 $app->userpic ($user->{name}, sub {
169 return unless $self->{imagebox}; 187 return unless $self->{imagebox};
170 188
171 if ($_[0]) { 189 if ($_[0]) {
172 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 190 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
191 unless ($::config{suppress_userpic}) {
173 $self->{imagebox}->add (gtk::image_from_data $_[0]); 192 $self->{imagebox}->add (gtk::image_from_data $_[0]);
193 }
174 $self->{imagebox}->show_all; 194 $self->{imagebox}->show_all;
175 } 195 }
176 }); 196 });
177 } 197 }
178 } 198 }
… …
185 205
186 $self->{info}->set_text ("$captures pris."); 206 $self->{info}->set_text ("$captures pris.");
187} 207}
188 208
189sub set_timer { 209sub set_timer {
190 my ($self, $when, $time, $moves) = @_; 210 my ($self, $start, $time, $moves) = @_;
191 211
192 $self->{clock}->stop unless $when;
193 $self->{clock}->set_time ($time, $moves); 212 $self->{clock}->set_time ($start, $time, $moves);
194 $self->{clock}->start ($when) if $when;
195} 213}
214
215### GAME WINDOW #############################################################
196 216
197package game; 217package game;
198 218
199use Scalar::Util qw(weaken); 219use Scalar::Util qw(weaken);
200 220
… …
212 232
213use POSIX qw(ceil); 233use POSIX qw(ceil);
214 234
215sub new { 235sub new {
216 my ($self, %arg) = @_; 236 my ($self, %arg) = @_;
237
217 $self = $self->Glib::Object::new; 238 $self = $self->Glib::Object::new;
218 $self->{$_} = delete $arg{$_} for keys %arg; 239 $self->{$_} = delete $arg{$_} for keys %arg;
219 240
220 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);
221 243
222 $self->signal_connect (destroy => sub { 244 $self->signal_connect (destroy => sub {
223 $self->unlisten; 245 $self->unlisten;
224 delete $self->{app}{game}{$self->{channel}}; 246 delete $self->{app}{game}{$self->{channel}};
225 %{$_[0]} = (); 247 %{$_[0]} = ();
226 });#d# 248 });#d#
227 249
228 $self->add (my $hpane = new Gtk2::HPaned); 250 $self->add (my $hpane = new Gtk2::HPaned);
229 gtk::state $hpane, "game::hpane", undef, position => 500; 251 gtk::state $hpane, "game::hpane", undef, position => 420;
230 252
231 # LEFT PANE 253 # LEFT PANE
232 254
233 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0); 255 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
234 256
235 $self->{boardbox} = new Gtk2::VBox;
236
237 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 257 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
238 258
239 # board box (aspect/canvas) 259 # board box (aspect/canvas)
240 260
241 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
242
243 # RIGHT PANE 261 # RIGHT PANE
244 262
245 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1); 263 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
246 $hpane->set (position_set => 1); 264 $hpane->set (position_set => 1);
247 265
248 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0); 266 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
249 267
250 { 268 {
251 $frame->add (my $vbox = new Gtk2::VBox); 269 $frame->add (my $vbox = new Gtk2::VBox);
252 $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
253 272
254 $vbox->add (my $hbox = new Gtk2::HBox); 273 $vbox->add (my $hbox = new Gtk2::HBox);
255 274
256 $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);
257 276
258 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 277 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
259 278
260 $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);
261 $scale->set_draw_value (0); 280 $scale->set_draw_value (0);
… …
273 for COLOUR_WHITE, COLOUR_BLACK; 292 for COLOUR_WHITE, COLOUR_BLACK;
274 293
275 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0); 294 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
276 295
277 $buttonbox->add ($self->{button_pass} = 296 $buttonbox->add ($self->{button_pass} =
278 Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0)); 297 Gtk2::Button->Glib::Object::new (label => "Pass", visible => 0, no_show_all => 1));
279 $self->{button_pass}->signal_connect (clicked => sub { 298 $self->{button_pass}->signal_connect (clicked => sub {
280 $self->{board_click}->(255, 255) if $self->{board_click}; 299 $self->{board_click}->(255, 255) if $self->{board_click};
281 }); 300 });
282 $buttonbox->add ($self->{button_undo} = 301 $buttonbox->add ($self->{button_undo} =
283 Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0)); 302 Gtk2::Button->Glib::Object::new (label => "Undo", visible => 0, no_show_all => 1));
284 $self->{button_undo}->signal_connect (clicked => sub { 303 $self->{button_undo}->signal_connect (clicked => sub {
285 $self->send (req_undo => channel => $self->{channel}); 304 $self->send (req_undo => channel => $self->{channel});
286 }); 305 });
287 $buttonbox->add ($self->{button_resign} = 306 $buttonbox->add ($self->{button_resign} =
288 Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0)); 307 Gtk2::Button->Glib::Object::new (label => "Resign", visible => 0, no_show_all => 1));
289 $self->{button_resign}->signal_connect (clicked => sub { 308 $self->{button_resign}->signal_connect (clicked => sub {
290 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour}); 309 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
291 }); 310 });
292 311
293 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0); 312 $vbox->pack_start (($self->{chat} = new chat app => $self->{app}), 1, 1, 0);
313
314 $self->{chat}->signal_connect (tag_event => sub {
315 my (undef, $tag, $event, $content) = @_;
316 });
294 317
295 $self->set_channel ($self->{channel}); 318 $self->set_channel ($self->{channel});
296 319
297 $self->show_all; 320 $self->show_all;
298 321
… …
302sub set_channel { 325sub set_channel {
303 my ($self, $channel) = @_; 326 my ($self, $channel) = @_;
304 327
305 $self->{channel} = $channel; 328 $self->{channel} = $channel;
306 329
307 if ($self->{channel} > 0) { 330 if (defined $self->{channel}) {
308 $self->listen ($self->{conn}); 331 $self->listen ($self->{conn});
309 332
310 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1); 333 $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); 334 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
312 335
313 $self->signal_connect (delete_event => sub { $self->part; 1 }); 336 $self->signal_connect (delete_event => sub { $self->part; 1 });
314 $self->{chat}->signal_connect (command => sub { 337 $self->{chat}->signal_connect (command => sub {
315 my ($chat, $cmd, $arg) = @_; 338 my ($chat, $cmd, $arg) = @_;
316 if ($cmd eq "rsave") { 339 if ($cmd eq "rsave") {
340 local $Storable::forgive_me = 1;
317 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d# 341 #Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
342 Storable::nstore { %$self }, $arg;#d#
318 } else { 343 } else {
319 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self); 344 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
320 } 345 }
321 }); 346 });
322 } 347 }
323} 348}
324 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 }
396}
397
325sub event_update_users { 398sub event_update_users {
326 my ($self, $add, $update, $remove) = @_; 399 my ($self, $add, $update, $remove) = @_;
327 400
328# $self->{userlist}->update ($add, $update, $remove); 401# $self->{userlist}->update ($add, $update, $remove);
329 402
… …
336 $important{$self->{black}{name}}++; 409 $important{$self->{black}{name}}++;
337 $important{$self->{white}{name}}++; 410 $important{$self->{white}{name}}++;
338 $important{$self->{owner}{name}}++; 411 $important{$self->{owner}{name}}++;
339 412
340 if (my @users = grep $important{$_->{name}}, @$add) { 413 if (my @users = grep $important{$_->{name}}, @$add) {
341 $self->{chat}->append_text ("\n<header>Joins:</header>"); 414 $self->{chat}->append_text ("\n<leader>Joins:</leader>");
342 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 415 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
343 } 416 }
344 if (my @users = grep $important{$_->{name}}, @$remove) { 417 if (my @users = grep $important{$_->{name}}, @$remove) {
345 $self->{chat}->append_text ("\n<header>Parts:</header>"); 418 $self->{chat}->append_text ("\n<leader>Parts:</leader>");
346 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 419 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
347 } 420 }
348} 421}
349 422
350sub join { 423### GAME INFO ###############################################################
424
425sub draw_setup {
351 my ($self) = @_; 426 my ($self, $inlay) = @_;
427
352 return if $self->{joined}; 428 return unless $self->{joined};
353 429
354 $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}};
355} 579}
356 580
357sub update_cursor { 581sub update_cursor {
358 my ($self) = @_; 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 }
359 602
360 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active; 603 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
361 604
362 delete $self->{board_click}; 605 delete $self->{board_click};
363 606
364 if ($self->{teacher} eq $self->{app}{conn}) { 607 if ($self->{teacher} eq $self->{app}{conn}) {
365 #TODO# # teaching mode not implemented 608 #TODO# # teaching mode not implemented
366 $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1); 609 $self->{button_pass}->set (label => "Pass", sensitive => 1);
610 $self->{button_pass}->show;
367 $self->{button_undo}->hide; 611 $self->{button_undo}->hide;
368 $self->{button_resign}->hide; 612 $self->{button_resign}->hide;
369 $self->{board}->set (cursor => undef); 613 $self->{board}->set (cursor => undef);
370 614
371 } elsif ($running && $self->{colour} != COLOUR_NONE) { 615 } elsif ($running && $self->{colour} != COLOUR_NONE) {
… …
373 $self->{button_undo}->show; 617 $self->{button_undo}->show;
374 $self->{button_resign}->show; 618 $self->{button_resign}->show;
375 619
376 if ($self->{cur_board}{score}) { 620 if ($self->{cur_board}{score}) {
377 # during scoring 621 # during scoring
378 $self->{button_pass}->set (label => "Done", sensitive => 1, visible => 1); 622 $self->{button_pass}->set (label => "Done", sensitive => 1);
623 $self->{button_pass}->show;
379 $self->{board}->set (cursor => sub { 624 $self->{board}->set (cursor => sub {
380 $_[0] & (MARK_B | MARK_W) 625 $_[0] & (MARK_B | MARK_W)
381 ? $_[0] ^ MARK_GRAYED 626 ? $_[0] ^ MARK_GRAYED
382 : $_[0]; 627 : $_[0];
383 }); 628 });
… …
393 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED), 638 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
394 ); 639 );
395 } 640 }
396 }; 641 };
397 642
398 } elsif (1 - $self->{colour} == $self->{cur_board}{last}) { 643 } elsif ($self->{colour} == $self->{whosemove}) {
399 # normal move 644 # normal move
400 $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1); 645 $self->{button_pass}->set (label => "Pass", sensitive => 1);
646 $self->{button_pass}->show;
401 $self->{board}->set (cursor => sub { 647 $self->{board}->set (cursor => sub {
402 # if is_valid_move oder so#TODO# 648 $self->{cur_board}
403 $_[0] & (MARK_B | MARK_W) 649 && $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
404 ? $_[0] 650 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
405 : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B); 651 ? $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
652 : $_[0];
406 }); 653 });
407 $self->{board_click} = sub { 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);
408 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]); 658 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
409 $self->{board}->set (cursor => undef); 659 $self->{board}->set (cursor => undef);
410 delete $self->{board_click}; 660 delete $self->{board_click};
411 $self->{button_pass}->sensitive (0); 661 $self->{button_pass}->sensitive (0);
412 }; 662 };
413 } else { 663 } else {
414 $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1); 664 $self->{button_pass}->set (label => "Pass", sensitive => 0);
665 $self->{button_pass}->show;
666 $self->{board}->set (cursor => undef);
415 } 667 }
416 } else { 668 } else {
417 $self->{button_undo}->hide; 669 $self->{button_undo}->hide;
418 $self->{button_resign}->hide; 670 $self->{button_resign}->hide;
419 $self->{button_pass}->hide; 671 $self->{button_pass}->hide;
420 $self->{board}->set (cursor => undef); 672 $self->{board}->set (cursor => undef);
421 #TODO# # implement coordinate-grabbing 673 #TODO# # implement coordinate-grabbing
422 } 674 }
423} 675}
424 676
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 }
436}
437
438sub update_board { 677sub update_board {
439 my ($self) = @_; 678 my ($self) = @_;
679
440 return unless $self->{path}; 680 return unless $self->{path};
441 681
442 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1)); 682 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
443 683
444 $self->{cur_board} = new KGS::Game::Board $self->{size}; 684 $self->{cur_board} = new KGS::Game::Board $self->{size};
445 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]); 685 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
446 686
447 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_]) 687 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
448 for COLOUR_WHITE, COLOUR_BLACK; 688 for COLOUR_WHITE, COLOUR_BLACK;
689
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;
449 705
450 if ($self->{showmove} == @{$self->{path}}) { 706 if ($self->{showmove} == @{$self->{path}}) {
451 $self->{timers} = [ 707 $self->{timers} = [
452 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}], 708 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
453 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}], 709 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
… …
458 [0, @{$self->{cur_board}{timer}[0]}], 714 [0, @{$self->{cur_board}{timer}[0]}],
459 [0, @{$self->{cur_board}{timer}[1]}], 715 [0, @{$self->{cur_board}{timer}[1]}],
460 ]); 716 ]);
461 } 717 }
462 718
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;
478} 719}
479 720
480sub event_update_tree { 721sub event_update_tree {
481 my ($self) = @_; 722 my ($self) = @_;
723
724 (delete $self->{undo_inlay})->clear
725 if $self->{undo_inlay};
482 726
483 $self->{path} = $self->get_path; 727 $self->{path} = $self->get_path;
484 728
485 if ($self->{moveadj}) { 729 if ($self->{moveadj}) {
486 my $upper = $self->{moveadj}->upper; 730 my $upper = $self->{moveadj}->upper;
… …
497 } 741 }
498} 742}
499 743
500sub event_update_comments { 744sub event_update_comments {
501 my ($self, $node, $comment, $newnode) = @_; 745 my ($self, $node, $comment, $newnode) = @_;
502 $self->SUPER::event_update_comments($node, $comment, $newnode); 746 $self->SUPER::event_update_comments ($node, $comment, $newnode);
503 747
504 my $text; 748 my $text;
505 749
506 $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>"
507 if $newnode; 751 if $newnode;
… …
532 } 776 }
533 777
534 $self->{chat}->append_text ($text); 778 $self->{chat}->append_text ($text);
535} 779}
536 780
537sub event_join {
538 my ($self) = @_;
539
540 $self->SUPER::event_join (@_);
541 $self->init_tree;
542 $self->event_update_game;
543}
544
545sub event_part {
546 my ($self) = @_;
547
548 $self->SUPER::event_part;
549 $self->destroy;
550}
551
552sub event_move { 781sub event_move {
553 my ($self, $pass) = @_; 782 my ($self, $pass) = @_;
783
554 sound::play 1, $pass ? "pass" : "move"; 784 sound::play 1, $pass ? "pass" : "move";
555
556 if ($self->{undo_inlay}) {
557 (delete $self->{undo_inlay})->clear;
558 }
559} 785}
560 786
561sub event_update_game { 787### GAMEPLAY EVENTS #########################################################
562 my ($self) = @_;
563
564 $self->SUPER::event_update_game;
565
566 return unless $self->{joined};
567
568 $self->{colour} = $self->player_colour ($self->{conn}{name});
569
570 my $title = defined $self->{channel}
571 ? $self->owner->as_string . " " . $self->opponent_string
572 : "Game Window";
573 $self->set_title ("KGS Game $title");
574 $self->{title}->set_text ($title);
575
576 $self->{user}[COLOUR_BLACK] = $self->{black};
577 $self->{user}[COLOUR_WHITE] = $self->{white};
578
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;
599
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
617 if ($self->is_inprogress) {
618 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
619 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
620 }
621 $text .= "\nType: " . util::toxml $gametype{$self->type};
622
623 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
624
625 $text .= "\nTime: ";
626
627 if ($rules->{timesys} == TIMESYS_NONE) {
628 $text .= "UNLIMITED";
629 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
630 $text .= util::format_time $rules->{time};
631 $text .= " ABS";
632 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
633 $text .= util::format_time $rules->{time};
634 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
635 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
636 $text .= util::format_time $rules->{time};
637 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
638 }
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
657 $inlay->append_text ("<infoblock>$text</infoblock>");
658
659}
660
661sub event_update_rules {
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 788
676sub event_resign_game { 789sub event_resign_game {
677 my ($self, $player) = @_; 790 my ($self, $player) = @_;
678 791
679 sound::play 3, "resign"; 792 sound::play 3, "resign";
680 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 793 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
681 . "\n<user>" 794 . "\n<user>"
682 . (util::toxml $self->{user}[$msg->{player}]->as_string) 795 . (util::toxml $self->{user}[$player]->as_string)
683 . "</user> resigned.</infoblock>"); 796 . "</user> resigned."
797 . "\n<user>"
798 . (util::toxml $self->{user}[1 - $player]->as_string)
799 . "</user> wins the game."
800 . "</infoblock>");
684} 801}
685 802
686sub event_out_of_time { 803sub event_out_of_time {
687 my ($self, $player) = @_; 804 my ($self, $player) = @_;
688 805
689 sound::play 3, "timewin"; 806 sound::play 3, "timewin";
690 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>" 807 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
691 . "\n<user>" 808 . "\n<user>"
809 . (util::toxml $self->{user}[$msg->{1 - player}]->as_string)
810 . "</user> ran out of time and lost."
811 . "\n<user>"
692 . (util::toxml $self->{user}[$msg->{player}]->as_string) 812 . (util::toxml $self->{user}[$msg->{player}]->as_string)
813 . "</user> wins the game."
814 . "</infoblock>");
815}
816
817sub event_owner_left {
818 my ($self) = @_;
819
820 $self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
693 . "</user> ran out of time and lost.</infoblock>"); 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>");
694} 829}
695 830
696sub event_done { 831sub event_done {
697 my ($self) = @_; 832 my ($self) = @_;
698 833
699 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) { 834 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
835 sound::play 2, "info" unless $inlay->{count};
700 $self->{chat}->append_text ("\n<infoblock><header>Done</header>" 836 $self->{chat}->append_text ("\n<infoblock><header>Press Done</header>"
701 . "\nYour opponent pressed done."); 837 . "\nYour opponent pressed done. Now it's up to you.");
702 } 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;
703} 848}
704 849
705sub inject_final_result { 850sub inject_final_result {
706 my ($self, $msg) = @_; 851 my ($self, $msg) = @_;
707 852
… …
710 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 855 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
711 . "</infoblock>" 856 . "</infoblock>"
712 ); 857 );
713} 858}
714 859
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 { 860sub inject_req_undo {
728 my ($self, $msg) = @_; 861 my ($self, $msg) = @_;
729 862
730 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay; 863 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
731 return if $inlay->{ignore}; 864 return if $inlay->{ignore};
732 865
733 sound::play 3, "warning" unless $inlay->{count}; 866 sound::play 2, "warning" unless $inlay->{count};
734 $inlay->{count}++; 867 $inlay->{count}++;
735 868
736 $inlay->clear; 869 $inlay->clear;
737 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n"); 870 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
738 $inlay->append_button ("Grant", sub { 871 $inlay->append_button ("Grant", sub {
739 $inlay->clear; 872 (delete $self->{undo_inlay})->clear;
740 $self->send (grant_undo => channel => $self->{channel}); 873 $self->send (grant_undo => channel => $self->{channel});
741 }); 874 });
742 $inlay->append_button ("Ignore", sub { 875 $inlay->append_button ("Ignore", sub {
743 $inlay->clear; 876 $inlay->clear;
744 $inlay->{ignore} = 1; 877 $inlay->{ignore} = 1;
… …
749} 882}
750 883
751sub inject_new_game { 884sub inject_new_game {
752 my ($self, $msg) = @_; 885 my ($self, $msg) = @_;
753 886
754 $self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>"); 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>");
755 delete $self->{cid}; 893 delete $self->{cid};
756} 894}
895
896### CHALLENGE HANDLING ######################################################
757 897
758sub draw_challenge { 898sub draw_challenge {
759 my ($self, $id) = @_; 899 my ($self, $id) = @_;
760 900
761 my $info = $self->{challenge}{$id}; 901 my $info = $self->{challenge}{$id};
… …
763 my $rules = $info->{rules}; 903 my $rules = $info->{rules};
764 904
765 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;; 905 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
766 my $opponent = $as_black ? $info->{white} : $info->{black}; 906 my $opponent = $as_black ? $info->{white} : $info->{black};
767 907
768 my ($size, $time, $interval, $count); 908 my ($size, $time, $interval, $count, $type);
769 909
770 if (!$self->{channel}) { 910 if (!defined $self->{channel}) {
771 $inlay->append_text ("\nNotes: "); 911 $inlay->append_text ("\nNotes: ");
772 $inlay->append_entry (\$info->{notes}, 20, ""); 912 $inlay->append_widget (gtk::textentry \$info->{notes}, 20, "");
773 $inlay->append_text ("\nGlobal Offer: "); 913 $inlay->append_text ("\nGlobal Offer: ");
774 $inlay->append_optionmenu (\$info->{flags}, 914 $inlay->append_optionmenu (\$info->{flags},
775 0 => "No", 915 0 => "No",
776 2 => "Yes", 916 2 => "Yes",
777 ); 917 );
778 } else { 918 } else {
779 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes}); 919 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
780 } 920 }
781 921
782 $inlay->append_text ("\nType: "); 922 $inlay->append_text ("\nType: ");
783 $inlay->append_optionmenu ( 923 $type = $inlay->append_optionmenu (
784 \$info->{gametype}, 924 \$info->{gametype},
785 GAMETYPE_DEMONSTRATION , "Demonstration", 925 GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
786 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)", 926 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
787 GAMETYPE_TEACHING , "Teaching", 927 GAMETYPE_TEACHING , "Teaching (not yet)",
788 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)", 928 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
789 GAMETYPE_SIMUL , "Simul (not yet!)", 929 GAMETYPE_SIMUL , "Simul (not yet!)",
790 GAMETYPE_FREE , "Free", 930 GAMETYPE_FREE , "Free",
791 GAMETYPE_RATED , "Rated", 931 GAMETYPE_RATED , "Rated",
792 sub { 932 sub {
793 $size->set_history (2) if $_[0] eq GAMETYPE_RATED; 933 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
794 }, 934 },
795 ); 935 );
796 936
797 if ($self->{channel}) { 937 if (defined $self->{channel}) {
798 $inlay->append_text ("\nMy Colour: "); 938 $inlay->append_text ("\nMy Colour: ");
799 $inlay->append_optionmenu ( 939 $inlay->append_optionmenu (
800 \$as_black, 940 \$as_black,
801 0 => "White", 941 0 => "White",
802 1 => "Black", 942 1 => "Black",
… …
817 RULESET_NEW_ZEALAND, "New Zealand", 957 RULESET_NEW_ZEALAND, "New Zealand",
818 ); 958 );
819 959
820 $inlay->append_text ("\nSize: "); 960 $inlay->append_text ("\nSize: ");
821 $size = $inlay->append_optionmenu ( 961 $size = $inlay->append_optionmenu (
962 \$info->{rules}{size},
822 \$info->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38 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 },
823 ); 968 );
824 969
825 if ($self->{channel}) { 970 if (defined $self->{channel}) {
826 $inlay->append_text ("\nHandicap: "); 971 $inlay->append_text ("\nHandicap: ");
827 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9); 972 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
828 973
829 $inlay->append_text ("\nKomi: "); 974 $inlay->append_text ("\nKomi: ");
830 $inlay->append_entry (\$info->{rules}{komi}, 5); 975 $inlay->append_widget (gtk::numentry \$info->{rules}{komi}, 5);
831 } 976 }
832 977
833 $inlay->append_text ("\nTimesys: "); 978 $inlay->append_text ("\nTimesys: ");
834 $inlay->append_optionmenu ( 979 $inlay->append_optionmenu (
835 \$info->{rules}{timesys}, 980 \$info->{rules}{timesys},
… …
864 } 1009 }
865 } 1010 }
866 ); 1011 );
867 1012
868 $inlay->append_text ("\nMain Time: "); 1013 $inlay->append_text ("\nMain Time: ");
869 $time = $inlay->append_entry (\$info->{rules}{time}, 5); 1014 $time = $inlay->append_widget (gtk::timeentry \$info->{rules}{time}, 5);
870 $inlay->append_text ("\nInterval: "); 1015 $inlay->append_text ("\nInterval: ");
871 $interval = $inlay->append_entry (\$info->{rules}{interval}, 3); 1016 $interval = $inlay->append_widget (gtk::timeentry \$info->{rules}{interval}, 5);
872 $inlay->append_text ("\nPeriods/Stones: "); 1017 $inlay->append_text ("\nPeriods/Stones: ");
873 $count = $inlay->append_entry (\$info->{rules}{count}, 2); 1018 $count = $inlay->append_widget (gtk::numentry \$info->{rules}{count}, 5);
874 1019
875 $inlay->append_text ("\n"); 1020 $inlay->append_text ("\n");
876 1021
877 if (!$self->{channel}) { 1022 if (!defined $self->{channel}) {
878 $inlay->append_button ("Create Challenge", sub { 1023 $inlay->append_button ("Create Challenge", sub {
879 $inlay->clear; 1024 $inlay->clear;
880 $self->{cid} = $self->{conn}->alloc_clientid; 1025 $self->{cid} = $self->{conn}->alloc_clientid;
881 $self->send (new_game => 1026 $self->send (new_game =>
882 channel => delete $self->{roomid}, 1027 channel => delete $self->{roomid},
… …
912 }); 1057 });
913 } 1058 }
914 } 1059 }
915} 1060}
916 1061
917sub draw_users { 1062sub new_game_challenge {
918 my ($self, $inlay) = @_; 1063 my ($self) = @_;
919 1064
920 for (sort keys %{$self->{users}}) { 1065 my $d = $self->{app}{defaults};
921 $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,
922 } 1081 };
1082 $self->draw_challenge ("");
923} 1083}
924 1084
925sub event_challenge { 1085sub event_challenge {
926 my ($self, $info) = @_; 1086 my ($self, $info) = @_;
927 1087
928 my $as_black = $info->{black}->{name} eq $self->{conn}{name}; 1088 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
929 my $opponent = $as_black ? $info->{white} : $info->{black}; 1089 my $opponent = $as_black ? $info->{white} : $info->{black};
930 1090
931 my $id = $opponent->{name}; 1091 my $id = $opponent->{name};
1092
1093 sound::play 2, "info";
932 1094
933 $self->{challenge}{$id} = $info; 1095 $self->{challenge}{$id} = $info;
934 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay ( 1096 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
935 exists $self->{challenge}{""} 1097 exists $self->{challenge}{""}
936 ? "Challenge from $opponent->{name}" 1098 ? "Challenge from " . $opponent->as_string
937 : "Challenge to $opponent->{name}", 1099 : "Challenge to " . $opponent->as_string,
938 sub { 1100 sub {
939 $self->{challenge}{$id}{inlay} = $_[0]; 1101 $self->{challenge}{$id}{inlay} = $_[0];
940 $self->draw_challenge ($id); 1102 $self->draw_challenge ($id);
941 }, 1103 },
942 !exists $self->{challenge}{""} # only open when not offerer 1104 !exists $self->{challenge}{""} # only open when not offerer

Diff Legend

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