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