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.98 by pcg, Sun May 30 02:22:24 2004 UTC vs.
Revision 1.140 by root, Wed Oct 13 00:33:15 2004 UTC

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

Diff Legend

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