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.97 by pcg, Sat May 29 06:38:27 2004 UTC vs.
Revision 1.126 by root, Wed Jun 2 12:23:35 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
134 $self->add (my $vbox = new Gtk2::VBox); 151 $self->add (my $vbox = new Gtk2::VBox);
135 152
136 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 153 $vbox->pack_start (($self->{name} = new Gtk2::Label "-"), 1, 1, 0);
137 $vbox->add ($self->{info} = new Gtk2::Label ""); 154 $vbox->pack_start (($self->{info} = new Gtk2::Label "-"), 1, 1, 0);
138 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock}; 155 $vbox->pack_start (($self->{clock} = new game::goclock), 1, 1, 0);
139 156
140 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 157 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
141 158
142 $self; 159 $self;
143} 160}
… …
167 } 184 }
168 185
169 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); 186 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
170} 187}
171 188
172sub set_state { 189sub set_captures {
173 my ($self, $captures, $timer, $when) = @_; 190 my ($self, $captures) = @_;
174
175 $self->{clock}->stop unless $when;
176 $self->{clock}->set_time ($timer);
177 $self->{clock}->start ($when) if $when;
178 191
179 $self->{info}->set_text ("$captures pris."); 192 $self->{info}->set_text ("$captures pris.");
180} 193}
194
195sub set_timer {
196 my ($self, $start, $time, $moves) = @_;
197
198 $self->{clock}->set_time ($start, $time, $moves);
199}
200
201### GAME WINDOW #############################################################
181 202
182package game; 203package game;
183 204
184use Scalar::Util qw(weaken); 205use Scalar::Util qw(weaken);
185 206
… …
187use KGS::Game::Board; 208use KGS::Game::Board;
188 209
189use Gtk2::GoBoard; 210use Gtk2::GoBoard;
190use Gtk2::GoBoard::Constants; 211use Gtk2::GoBoard::Constants;
191 212
213use base KGS::Game;
214use base KGS::Listener::Game;
215
192use Glib::Object::Subclass 216use Glib::Object::Subclass
193 Gtk2::Window; 217 Gtk2::Window;
194 218
195use base KGS::Listener::Game;
196use base KGS::Game;
197
198use POSIX qw(ceil); 219use POSIX qw(ceil);
199 220
200sub new { 221sub new {
201 my ($self, %arg) = @_; 222 my ($self, %arg) = @_;
223
202 $self = $self->Glib::Object::new; 224 $self = $self->Glib::Object::new;
203 $self->{$_} = delete $arg{$_} for keys %arg; 225 $self->{$_} = delete $arg{$_} for keys %arg;
204 226
205 gtk::state $self, "game::window", undef, window_size => [600, 500]; 227 gtk::state $self, "game::window", undef, window_size => [620, 460];
228 $self->set (allow_shrink => 1);
206 229
207 $self->signal_connect (destroy => sub { 230 $self->signal_connect (destroy => sub {
208 $self->unlisten; 231 $self->unlisten;
209 delete $self->{app}{game}{$self->{channel}}; 232 delete $self->{app}{game}{$self->{channel}};
210 %{$_[0]} = (); 233 %{$_[0]} = ();
211 });#d# 234 });#d#
212 235
213 $self->add (my $hpane = new Gtk2::HPaned); 236 $self->add (my $hpane = new Gtk2::HPaned);
214 gtk::state $hpane, "game::hpane", undef, position => 500; 237 gtk::state $hpane, "game::hpane", undef, position => 420;
215 238
216 # LEFT PANE 239 # LEFT PANE
217 240
218 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0); 241 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
219 242
220 $self->{boardbox} = new Gtk2::VBox;
221
222 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 243 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
223 244
224 # board box (aspect/canvas) 245 # board box (aspect/canvas)
225 246
226 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
227
228 # RIGHT PANE 247 # RIGHT PANE
229 248
230 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1); 249 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
231 $hpane->set (position_set => 1); 250 $hpane->set (position_set => 1);
232 251
233 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0); 252 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
234 253
235 { 254 {
236 $frame->add (my $vbox = new Gtk2::VBox); 255 $frame->add (my $vbox = new Gtk2::VBox);
237 $vbox->add ($self->{title} = new Gtk2::Label $title); 256 $vbox->add ($self->{title} = new Gtk2::Label "-");
238 257
239 $vbox->add (my $hbox = new Gtk2::HBox); 258 $vbox->add (my $hbox = new Gtk2::HBox);
240 259
241 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0); 260 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 0, 0);
242 261
243 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 262 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
244 263
245 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); 264 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
246 $scale->set_draw_value (0); 265 $scale->set_draw_value (0);
247 $scale->set_digits (0); 266 $scale->set_digits (0);
248 267
249 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 268 $self->{moveadj}->signal_connect (value_changed => sub {
269 $self->{showmove} = int $self->{moveadj}->get_value;
270 $self->update_board;
271 });
250 } 272 }
251 273
252 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 274 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
253 275
254 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_) 276 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
255 for COLOUR_WHITE, COLOUR_BLACK; 277 for COLOUR_WHITE, COLOUR_BLACK;
278
279 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
280
281 $buttonbox->add ($self->{button_pass} =
282 Gtk2::Button->Glib::Object::new (label => "Pass", visible => 0));
283 $self->{button_pass}->signal_connect (clicked => sub {
284 $self->{board_click}->(255, 255) if $self->{board_click};
285 });
286 eval { $self->{button_pass}->set (no_show_all => 1) }; # workaround for gtk+-2.2
287 $buttonbox->add ($self->{button_undo} =
288 Gtk2::Button->Glib::Object::new (label => "Undo", visible => 0));
289 $self->{button_undo}->signal_connect (clicked => sub {
290 $self->send (req_undo => channel => $self->{channel});
291 });
292 eval { $self->{button_undo}->set (no_show_all => 1) }; # workaround for gtk+-2.2
293 $buttonbox->add ($self->{button_resign} =
294 Gtk2::Button->Glib::Object::new (label => "Resign", visible => 0));
295 $self->{button_resign}->signal_connect (clicked => sub {
296 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
297 });
298 eval { $self->{button_resign}->set (no_show_all => 1) }; # workaround for gtk+-2.2
256 299
257 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0); 300 $vbox->pack_start (($self->{chat} = new chat), 1, 1, 0);
258 301
259 $self->set_channel ($self->{channel}); 302 $self->set_channel ($self->{channel});
260 303
261 $self->show_all; 304 $self->show_all;
262 305
… …
284 } 327 }
285 }); 328 });
286 } 329 }
287} 330}
288 331
332### JOIN/LEAVE ##############################################################
333
334sub join {
335 my ($self) = @_;
336 return if $self->{joined};
337
338 $self->SUPER::join;
339}
340
341sub part {
342 my ($self) = @_;
343
344 $self->hide;
345 $self->SUPER::part;
346}
347
348sub event_join {
349 my ($self) = @_;
350
351 $self->SUPER::event_join (@_);
352 $self->init_tree;
353 $self->event_update_game;
354}
355
356sub event_part {
357 my ($self) = @_;
358
359 $self->SUPER::event_part;
360 $self->destroy;
361}
362
363sub event_quit {
364 my ($self) = @_;
365
366 $self->SUPER::event_quit;
367 $self->destroy;
368}
369
370### USERS ###################################################################
371
372sub draw_users {
373 my ($self, $inlay) = @_;
374
375 for (sort keys %{$self->{users}}) {
376 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
377 }
378}
379
289sub event_update_users { 380sub event_update_users {
290 my ($self, $add, $update, $remove) = @_; 381 my ($self, $add, $update, $remove) = @_;
291 382
292# $self->{userlist}->update ($add, $update, $remove); 383# $self->{userlist}->update ($add, $update, $remove);
293 384
… …
295 for @$remove; 386 for @$remove;
296 387
297 $self->{users_inlay}->refresh; 388 $self->{users_inlay}->refresh;
298 389
299 my %important; 390 my %important;
391 $important{$self->{black}{name}}++;
392 $important{$self->{white}{name}}++;
300 $important{$self->{user1}{name}}++; 393 $important{$self->{owner}{name}}++;
301 $important{$self->{user2}{name}}++;
302 $important{$self->{user3}{name}}++;
303 394
304 if (my @users = grep $important{$_->{name}}, @$add) { 395 if (my @users = grep $important{$_->{name}}, @$add) {
305 $self->{chat}->append_text ("\n<header>Joins:</header>"); 396 $self->{chat}->append_text ("\n<leader>Joins:</leader>");
306 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 397 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
307 } 398 }
308 if (my @users = grep $important{$_->{name}}, @$remove) { 399 if (my @users = grep $important{$_->{name}}, @$remove) {
309 $self->{chat}->append_text ("\n<header>Parts:</header>"); 400 $self->{chat}->append_text ("\n<leader>Parts:</leader>");
310 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 401 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
311 } 402 }
312} 403}
313 404
314sub join { 405### GAME INFO ###############################################################
406
407sub draw_setup {
315 my ($self) = @_; 408 my ($self, $inlay) = @_;
409
316 return if $self->{joined}; 410 return unless $self->{joined};
317 411
318 $self->SUPER::join; 412 my $rules = $self->{rules};
413
414 my $text = "";
415
416 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
417 if $self->{teacher};
418
419 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
420 if $self->{owner}->is_valid;
421
422 if ($self->is_inprogress) {
423 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
424 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
425 }
426 $text .= "\nType: " . util::toxml $gametype{$self->type};
427
428 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
429
430 $text .= "\nTime: ";
431
432 if ($rules->{timesys} == TIMESYS_NONE) {
433 $text .= "UNLIMITED";
434 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
435 $text .= util::format_time $rules->{time};
436 $text .= " ABS";
437 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
438 $text .= util::format_time $rules->{time};
439 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
440 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
441 $text .= util::format_time $rules->{time};
442 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
443 }
444
445 $text .= "\nFlags:";
446 $text .= " private" if $self->is_private;
447 $text .= " started" if $self->is_inprogress;
448 $text .= " adjourned" if $self->is_adjourned;
449 $text .= " scored" if $self->is_scored;
450 $text .= " saved" if $self->is_saved;
451
452 if ($self->is_inprogress) {
453 $text .= "\nHandicap: " . $self->{handicap};
454 $text .= "\nKomi: " . $self->{komi};
455 $text .= "\nSize: " . $self->size_string;
456 }
457
458 if ($self->is_scored) {
459 $text .= "\nResult: " . $self->score_string;
460 }
461
462 $inlay->append_text ("<infoblock>$text</infoblock>");
463
464}
465
466sub event_update_game {
467 my ($self) = @_;
468
469 $self->SUPER::event_update_game;
470
471 return unless $self->{joined};
472
473 $self->{colour} = $self->player_colour ($self->{conn}{name});
474
475 $self->{user}[COLOUR_BLACK] = $self->{black};
476 $self->{user}[COLOUR_WHITE] = $self->{white};
477
478 # show board
479 if ($self->is_inprogress) {
480 if (!$self->{board}) {
481 $self->{left}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
482 $self->{board}->signal_connect (button_release => sub {
483 return unless $self->{cur_board};
484 if ($_[1] == 1) {
485 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
486 }
487 });
488 $self->{board}->show_all;
489 }
490 if (my $ch = delete $self->{challenge}) {
491 $_->{inlay}->destroy for values %$ch;
492 }
493 $self->update_cursor;
494 }
495
496 my $title = defined $self->{channel}
497 ? $self->owner->as_string . " " . $self->opponent_string
498 : "Game Window";
499 $self->set_title ("KGS Game $title");
500 $self->{title}->set_text ($title); # title gets redrawn wrongly
501
502 $self->{rules_inlay}->refresh;
503
504 if (exists $self->{teacher}) {
505 $self->{teacher_inlay} ||= $self->{chat}->new_inlay;
506 $self->{teacher_inlay}->clear;
507 $self->{teacher_inlay}->append_text ("\n<header>Teacher:</header> <user>"
508 . (util::toxml $self->{teacher}) . "</user>");
509 } elsif ($self->{teacher_inlay}) {
510 (delete $self->{teacher_inlay})->clear;
511 }
512
513 $self->update_cursor;
514}
515
516sub event_update_rules {
517 my ($self, $rules) = @_;
518
519 $self->{rules} = $rules;
520
521 if ($self->{user}) {
522 # todo. gets drawn wrongly
523
524 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
525 for COLOUR_BLACK, COLOUR_WHITE;
526 }
527
528 sound::play 3, "gamestart";
529 $self->{rules_inlay}->refresh;
530}
531
532### BOARD DISPLAY ###########################################################
533
534sub update_timers {
535 my ($self, $timers) = @_;
536
537 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
538
539 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
540 my $t = $timers->[$colour];
541 $self->{userpanel}[$colour]->set_timer (
542 $running && $colour == $self->{whosemove} && $t->[0],
543 $t->[1] || $self->{rules}{time}
544 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
545 && $self->{rules}{interval} * $self->{rules}{count}),
546 $t->[2]);
547 }
548}
549
550sub inject_set_gametime {
551 my ($self, $msg) = @_;
552
553 $self->{timers} = [
554 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
555 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
556 ];
557
558 $self->update_timers ($self->{timers})
559 if $self->{showmove} == @{$self->{path}};
319} 560}
320 561
321sub update_cursor { 562sub update_cursor {
322 my ($self) = @_; 563 my ($self) = @_;
323 564
324 my $move = int $self->{moveadj}->get_value; 565 return unless $self->{cur_board};
325 my $cb;
326 566
327 my $running = $move == @{$self->{path}} 567 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
328 && $self->is_active;
329 568
330 warn "plaiyng $self->{playing} running $running teach $self->{teacher}\n"; 569 delete $self->{board_click};
331 warn !($self->{playing} && $running); 570
332 warn $self->{teacher} ne $self->{app}{conn}; 571 if ($self->{teacher} eq $self->{app}{conn}) {
333 if (!($self->{playing} && $running) && $self->{teacher} ne $self->{app}{conn}) { 572 #TODO# # teaching mode not implemented
334 warn "A\n"; 573 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
574 $self->{button_undo}->hide;
575 $self->{button_resign}->hide;
335 $self->{board}->set (cursor_mask => 0, cursor_value => 0); 576 $self->{board}->set (cursor => undef);
336 } elsif ($self->{user1}{name} eq $self->{conn}{name}) { 577
337 warn "B\n"; 578 } elsif ($running && $self->{colour} != COLOUR_NONE) {
338 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_B | MARK_GRAYED); 579 # during game
339 $cb = sub { 580 $self->{button_undo}->show;
340 $self->send (upd_tree => 581 $self->{button_resign}->show;
341 channel => $self->{channel}, 582
342 tree => $self->gen_move_tree (COLOUR_BLACK, $_[0], $_[1]), 583 if ($self->{cur_board}{score}) {
584 # during scoring
585 $self->{button_pass}->set (label => "Done", visible => 1, sensitive => 1);
586 $self->{board}->set (cursor => sub {
587 $_[0] & (MARK_B | MARK_W)
588 ? $_[0] ^ MARK_GRAYED
589 : $_[0];
343 ); 590 });
344 }; 591 $self->{board_click} = sub {
345 } elsif ($self->{user2}{name} eq $self->{conn}{name}) { 592 if ($_[0] == 255) {
346 warn "C\n"; 593 $self->{button_pass}->sensitive (0);
347 $self->{board}->set (cursor_mask => MARK_B | MARK_W, cursor_value => MARK_W | MARK_GRAYED); 594 $self->done;
348 $cb = sub { 595 } else {
349 $self->send (upd_tree => 596 $self->send (mark_dead =>
350 channel => $self->{channel}, 597 channel => $self->{channel},
351 tree => $self->gen_move_tree (COLOUR_WHITE, $_[0], $_[1]), 598 x => $_[0],
599 y => $_[1],
600 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
601 );
602 }
603 };
604
605 } elsif ($self->{colour} == $self->{whosemove}) {
606 # normal move
607 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
608 $self->{board}->set (cursor => sub {
609 $self->{cur_board}
610 && $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
611 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
612 ? $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
613 : $_[0];
352 ); 614 });
615 $self->{board_click} = sub {
616 return unless
617 $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
618 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND);
619 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
620 $self->{board}->set (cursor => undef);
621 delete $self->{board_click};
622 $self->{button_pass}->sensitive (0);
623 };
624 } else {
625 $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
626 $self->{board}->set (cursor => undef);
353 }; 627 }
628 } else {
629 $self->{button_undo}->hide;
630 $self->{button_resign}->hide;
631 $self->{button_pass}->hide;
632 $self->{board}->set (cursor => undef);
633 #TODO# # implement coordinate-grabbing
354 } 634 }
355
356 $self->{board_click} = $cb;
357} 635}
358 636
359sub update_board { 637sub update_board {
360 my ($self) = @_; 638 my ($self) = @_;
639
361 return unless $self->{path}; 640 return unless $self->{path};
362 641
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)); 642 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
370 643
371 $self->{cur_board} = new KGS::Game::Board $self->{size}; 644 $self->{cur_board} = new KGS::Game::Board $self->{size};
372 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 645 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
373 646
647 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
648 if ($self->{curnode}{move} == 0) {
649 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
650 } else {
651 $self->{whosemove} = 1 - $self->{cur_board}{last};
652 }
653 } else {
654 # Chinese, Aga, NZ all have manual placement
655 if ($self->{curnode}{move} < $self->{handicap}) {
656 $self->{whosemove} = COLOUR_BLACK;
657 } elsif ($self->{curnode}{move} == $self->{handicap}) {
658 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
659 } else {
660 $self->{whosemove} = 1 - $self->{cur_board}{last};
661 }
662 }
663
664 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
374 for my $colour (COLOUR_WHITE, COLOUR_BLACK) { 665 for COLOUR_WHITE, COLOUR_BLACK;
375 $self->{userpanel}[$colour]->set_state ( 666
376 $self->{cur_board}{captures}[$colour], 667 my $start_time = $self->{rules}{time};
668
669 if ($self->{showmove} == @{$self->{path}}) {
670 $self->{timers} = [
671 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
672 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
673 ];
674 $self->update_timers ($self->{timers});
675 } else {
676 $self->update_timers ([
377 $self->{cur_board}{timer}[$colour], 677 [0, @{$self->{cur_board}{timer}[0]}],
378 ($running && $self->{lastmove_colour} == !$colour) 678 [0, @{$self->{cur_board}{timer}[1]}],
379 ? $self->{lastmove_time} : 0
380 ); 679 ]);
381 } 680 }
382 681
383 $self->{board}->set_board ($self->{cur_board}); 682 $self->{board}->set_board ($self->{cur_board});
384 683
684 if ($self->{cur_board}{score}) {
685 $self->{score_inlay} ||= $self->{chat}->new_inlay;
686 $self->{score_inlay}->clear;
687 $self->{score_inlay}->append_text ("\n<header>Scoring</header>"
688 . "\n<score>"
689 . "White: $self->{cur_board}{score}[COLOUR_WHITE], "
690 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
691 . "</score>");
692 } elsif ($self->{score_inlay}) {
693 (delete $self->{score_inlay})->clear;
694 }
695
385 $self->update_cursor; 696 $self->update_cursor;
697
386} 698}
387 699
388sub event_update_tree { 700sub event_update_tree {
389 my ($self) = @_; 701 my ($self) = @_;
702
703 (delete $self->{undo_inlay})->clear
704 if $self->{undo_inlay};
390 705
391 $self->{path} = $self->get_path; 706 $self->{path} = $self->get_path;
392 707
393 if ($self->{moveadj}) { 708 if ($self->{moveadj}) {
394 my $upper = $self->{moveadj}->upper; 709 my $upper = $self->{moveadj}->upper;
… …
440 } 755 }
441 756
442 $self->{chat}->append_text ($text); 757 $self->{chat}->append_text ($text);
443} 758}
444 759
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 { 760sub event_move {
461 my ($self, $pass) = @_; 761 my ($self, $pass) = @_;
762
462 sound::play 1, $pass ? "pass" : "move"; 763 sound::play 1, $pass ? "pass" : "move";
463} 764}
464 765
766### GAMEPLAY EVENTS #########################################################
767
465sub event_update_game { 768sub event_resign_game {
466 my ($self) = @_;
467
468 $self->SUPER::event_update_game;
469
470 return unless $self->{joined};
471
472 $self->{playing} = $self->{teacher} eq $self->{conn}{name}
473 || $self->is_playing ($self->{conn}{name});
474
475 my $title = defined $self->{channel}
476 ? $self->owner->as_string . " " . $self->opponent_string
477 : "Game Window";
478 $self->set_title("KGS Game $title");
479 $self->{title}->set_text ($title);
480
481 $self->{user}[COLOUR_BLACK] = $self->{user1};
482 $self->{user}[COLOUR_WHITE] = $self->{user2};
483
484 # show board
485 if ($self->is_inprogress) {
486 if (!$self->{boardbox}->parent) {
487 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
488 $self->{left}->add ($self->{boardbox});
489 $self->{board}->signal_connect (button_release => sub {
490 warn "XXX @_\n";#d#
491 if ($_[1] == 1) {
492 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
493 }
494 });
495 }
496 if (my $ch = delete $self->{challenge}) {
497 (delete $_->{inlay})->destroy for values %$ch;
498 }
499 $self->update_cursor;
500 }
501
502 $self->{left}->show_all;
503
504 $self->{rules_inlay}->refresh;
505
506}
507
508sub draw_setup {
509 my ($self, $inlay) = @_; 769 my ($self, $player) = @_;
510
511 return unless $self->{joined};
512
513 my $rules = $self->{rules};
514
515 my $text = "";
516
517 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
518 if $self->{teacher};
519
520 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
521 if $self->{user3}->is_valid;
522
523 if ($self->is_inprogress) {
524 $text .= "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
525 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
526 }
527 $text .= "\nType: " . util::toxml $gametype{$self->type};
528
529 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
530
531 $text .= "\nTime: ";
532
533 if ($rules->{timesys} == TIMESYS_NONE) {
534 $text .= "UNLIMITED";
535 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
536 $text .= util::format_time $rules->{time};
537 $text .= " ABS";
538 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
539 $text .= util::format_time $rules->{time};
540 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
541 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
542 $text .= util::format_time $rules->{time};
543 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
544 }
545
546 $text .= "\nFlags:";
547 $text .= " private" if $self->is_private;
548 $text .= " started" if $self->is_inprogress;
549 $text .= " adjourned" if $self->is_adjourned;
550 $text .= " scored" if $self->is_scored;
551 $text .= " saved" if $self->is_saved;
552
553 if ($self->is_inprogress) {
554 $text .= "\nHandicap: " . $self->{handicap};
555 $text .= "\nKomi: " . $self->{komi};
556 $text .= "\nSize: " . $self->size_string;
557 }
558
559 if ($self->is_scored) {
560 $text .= "\nResult: " . $self->score_string;
561 }
562
563 $inlay->append_text ("<infoblock>$text</infoblock>");
564
565}
566
567sub event_update_rules {
568 my ($self, $rules) = @_;
569
570 $self->{rules} = $rules;
571
572 if ($self->{user}) {
573 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
574 for COLOUR_BLACK, COLOUR_WHITE;
575 }
576
577 sound::play 3, "gamestart";
578
579 $self->{rules_inlay}->refresh;
580}
581
582sub inject_resign_game {
583 my ($self, $msg) = @_;
584 770
585 sound::play 3, "resign"; 771 sound::play 3, "resign";
586
587 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 772 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
588 . "\n<user>" 773 . "\n<user>"
589 . (util::toxml $self->{user}[$msg->{player}]->as_string) 774 . (util::toxml $self->{user}[$msg->{player}]->as_string)
590 . "</user> resigned.</infoblock>"); 775 . "</user> resigned."
776 . "\n<user>"
777 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
778 . "</user> wins the game."
779 . "</infoblock>");
780}
781
782sub event_time_win {
783 my ($self, $player) = @_;
784
785 sound::play 3, "timewin";
786 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
787 . "\n<user>"
788 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
789 . "</user> ran out of time and lost."
790 . "\n<user>"
791 . (util::toxml $self->{user}[$msg->{player}]->as_string)
792 . "</user> wins the game."
793 . "</infoblock>");
794}
795
796sub event_owner_left {
797 my ($self) = @_;
798
799 $self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
800 . "\nThe owner of this game left.</infoblock>");
801}
802
803sub event_teacher_left {
804 my ($self) = @_;
805
806 $self->{chat}->append_text ("\n<infoblock><header>Teacher left</header>"
807 . "\nThe teacher left the game.</infoblock>");
808}
809
810sub event_done {
811 my ($self) = @_;
812
813 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
814 sound::play 2, "info" unless $inlay->{count};
815 $self->{chat}->append_text ("\n<infoblock><header>Press Done</header>"
816 . "\nYour opponent pressed done. Now it's up to you.");
817 }
818 if ($self->{doneid} & 0x80000000) {
819 sound::play 2, "info" unless $inlay->{count};
820 $self->{chat}->append_text ("\n<infoblock><header>Press Done Again</header>"
821 . "\nThe board has changed.");
822 }
823
824 $self->{button_pass}->sensitive (!$self->{done}[$self->{colour}]);
825
826 $self->{chat}->set_end;
591} 827}
592 828
593sub inject_final_result { 829sub inject_final_result {
594 my ($self, $msg) = @_; 830 my ($self, $msg) = @_;
595 831
… …
598 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 834 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
599 . "</infoblock>" 835 . "</infoblock>"
600 ); 836 );
601} 837}
602 838
839sub inject_req_undo {
840 my ($self, $msg) = @_;
841
842 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
843 return if $inlay->{ignore};
844
845 sound::play 2, "warning" unless $inlay->{count};
846 $inlay->{count}++;
847
848 $inlay->clear;
849 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
850 $inlay->append_button ("Grant", sub {
851 (delete $self->{undo_inlay})->clear;
852 $self->send (grant_undo => channel => $self->{channel});
853 });
854 $inlay->append_button ("Ignore", sub {
855 $inlay->clear;
856 $inlay->{ignore} = 1;
857 # but leave inlay, so further undo requests get counted
858 });
859
860 $self->{chat}->set_end;
861}
862
603sub inject_new_game { 863sub inject_new_game {
604 my ($self, $msg) = @_; 864 my ($self, $msg) = @_;
605 865
606 $self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>"); 866 if ($msg->{cid} != $self->{cid}) {
867 $self->part;
868 warn "ERROR: challenge id mismatch, PLEASE REPORT, especially the circumstances (many games open? etc..)\n";#d#
869 }
870
871 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
607 delete $self->{cid}; 872 delete $self->{cid};
608} 873}
874
875### CHALLENGE HANDLING ######################################################
609 876
610sub draw_challenge { 877sub draw_challenge {
611 my ($self, $id) = @_; 878 my ($self, $id) = @_;
612 879
613 my $challenge = $self->{challenge}{$id}; 880 my $info = $self->{challenge}{$id};
614
615 my $inlay = $challenge->{inlay}; 881 my $inlay = $info->{inlay};
616 my $rules = $challenge->{rules}; 882 my $rules = $info->{rules};
617 883
618 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name} ? 1 : 0;; 884 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
619 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1}; 885 my $opponent = $as_black ? $info->{white} : $info->{black};
620 886
621 my ($size, $time, $interval, $count); 887 my ($size, $time, $interval, $count, $type);
622 888
623 if (!$self->{channel}) { 889 if (!$self->{channel}) {
624 $inlay->append_text ("\nNotes: "); 890 $inlay->append_text ("\nNotes: ");
625 $inlay->append_entry (\$channel->{notes}, 20, ""); 891 $inlay->append_widget (gtk::textentry \$info->{notes}, 20, "");
626 $inlay->append_text ("\nGlobal Offer: "); 892 $inlay->append_text ("\nGlobal Offer: ");
627 $inlay->append_optionmenu (\$challenge->{flags}, 893 $inlay->append_optionmenu (\$info->{flags},
628 0 => "No", 894 0 => "No",
629 2 => "Yes", 895 2 => "Yes",
630 ); 896 );
631 } else { 897 } else {
632 $inlay->append_text ("\nNotes: " . util::toxml $channel->{notes}); 898 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
633 } 899 }
634 900
635 $inlay->append_text ("\nType: "); 901 $inlay->append_text ("\nType: ");
636 $inlay->append_optionmenu ( 902 $type = $inlay->append_optionmenu (
637 \$challenge->{type}, 903 \$info->{gametype},
638 GAMETYPE_DEMONSTRATION , "Demonstration", 904 GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
639 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)", 905 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
640 GAMETYPE_TEACHING , "Teaching", 906 GAMETYPE_TEACHING , "Teaching (not yet)",
641 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)", 907 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
642 GAMETYPE_SIMUL , "Simul (not yet!)", 908 GAMETYPE_SIMUL , "Simul (not yet!)",
643 GAMETYPE_FREE , "Free", 909 GAMETYPE_FREE , "Free",
644 GAMETYPE_RATED , "Rated", 910 GAMETYPE_RATED , "Rated",
645 sub { 911 sub {
646 $size->set_history (2) if $_[0] eq GAMETYPE_RATED; 912 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
… …
652 $inlay->append_optionmenu ( 918 $inlay->append_optionmenu (
653 \$as_black, 919 \$as_black,
654 0 => "White", 920 0 => "White",
655 1 => "Black", 921 1 => "Black",
656 sub { 922 sub {
657 if ($challenge->{$_[0] ? "user1" : "user2"}{name} ne $self->{conn}{name}) { 923 if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
658 ($challenge->{user1}, $challenge->{user2}) = ($challenge->{user2}, $challenge->{user1}); 924 ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
659 } 925 }
660 } 926 }
661 ); 927 );
662 } 928 }
663 929
664 $inlay->append_text ("\nRuleset: "); 930 $inlay->append_text ("\nRuleset: ");
665 $inlay->append_optionmenu ( 931 $inlay->append_optionmenu (
666 \$challenge->{rules}{ruleset}, 932 \$info->{rules}{ruleset},
667 RULESET_JAPANESE , "Japanese", 933 RULESET_JAPANESE , "Japanese",
668 RULESET_CHINESE , "Chinese", 934 RULESET_CHINESE , "Chinese",
669 RULESET_AGA , "AGA", 935 RULESET_AGA , "AGA",
670 RULESET_NEW_ZEALAND, "New Zealand", 936 RULESET_NEW_ZEALAND, "New Zealand",
671 ); 937 );
672 938
673 $inlay->append_text ("\nSize: "); 939 $inlay->append_text ("\nSize: ");
674 $size = $inlay->append_optionmenu ( 940 $size = $inlay->append_optionmenu (
941 \$info->{rules}{size},
675 \$challenge->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38 942 (9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38),
943 sub {
944 $type->set_history (5) # reset to free
945 if $_[0] != 19 && $info->{gametype} == GAMETYPE_RATED;
946 },
676 ); 947 );
677 948
678 if ($self->{channel}) { 949 if ($self->{channel}) {
679 $inlay->append_text ("\nHandicap: "); 950 $inlay->append_text ("\nHandicap: ");
680 $inlay->append_optionmenu (\$challenge->{rules}{handicap}, map +($_, $_), 0..9); 951 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
681 952
682 $inlay->append_text ("\nKomi: "); 953 $inlay->append_text ("\nKomi: ");
683 $inlay->append_entry (\$challenge->{rules}{komi}, 5); 954 $inlay->append_widget (gtk::numentry \$info->{rules}{komi}, 5);
684 } 955 }
685 956
686 $inlay->append_text ("\nTimesys: "); 957 $inlay->append_text ("\nTimesys: ");
687 $inlay->append_optionmenu ( 958 $inlay->append_optionmenu (
688 \$challenge->{rules}{timesys}, 959 \$info->{rules}{timesys},
689 &TIMESYS_NONE => "None", 960 &TIMESYS_NONE => "None",
690 &TIMESYS_ABSOLUTE => "Absolute", 961 &TIMESYS_ABSOLUTE => "Absolute",
691 &TIMESYS_BYO_YOMI => "Byo Yomi", 962 &TIMESYS_BYO_YOMI => "Byo Yomi",
692 &TIMESYS_CANADIAN => "Canadian", 963 &TIMESYS_CANADIAN => "Canadian",
693 sub { 964 sub {
… …
717 } 988 }
718 } 989 }
719 ); 990 );
720 991
721 $inlay->append_text ("\nMain Time: "); 992 $inlay->append_text ("\nMain Time: ");
722 $time = $inlay->append_entry (\$challenge->{rules}{time}, 5); 993 $time = $inlay->append_widget (gtk::timeentry \$info->{rules}{time}, 5);
723 $inlay->append_text ("\nInterval: "); 994 $inlay->append_text ("\nInterval: ");
724 $interval = $inlay->append_entry (\$challenge->{rules}{interval}, 3); 995 $interval = $inlay->append_widget (gtk::timeentry \$info->{rules}{interval}, 5);
725 $inlay->append_text ("\nPeriods/Stones: "); 996 $inlay->append_text ("\nPeriods/Stones: ");
726 $count = $inlay->append_entry (\$challenge->{rules}{count}, 2); 997 $count = $inlay->append_widget (gtk::numentry \$info->{rules}{count}, 5);
727 998
728 $inlay->append_text ("\n"); 999 $inlay->append_text ("\n");
729 1000
730 if (!$self->{channel}) { 1001 if (!$self->{channel}) {
731 $inlay->append_button ("Create Challenge", sub { 1002 $inlay->append_button ("Create Challenge", sub {
732 $inlay->clear; 1003 $inlay->clear;
733 $self->{cid} = $self->{conn}->alloc_clientid; 1004 $self->{cid} = $self->{conn}->alloc_clientid;
734 $self->send (new_game => 1005 $self->send (new_game =>
735 channel => delete $self->{roomid}, 1006 channel => delete $self->{roomid},
1007 gametype => $info->{gametype},
736 cid => $self->{cid}, 1008 cid => $self->{cid},
737 type => $challenge->{type},
738 flags => $challenge->{flags}, 1009 flags => $info->{flags},
739 rules => $challenge->{rules}, 1010 rules => $info->{rules},
740 notes => $challenge->{notes}, 1011 notes => $info->{notes},
741 ); 1012 );
742 }); 1013 });
743 } else { 1014 } else {
744 $inlay->append_button ("OK", sub { 1015 $inlay->append_button ("OK", sub {
745 $inlay->clear; 1016 $inlay->clear;
746 $self->send (challenge => 1017 $self->send (challenge =>
747 channel => $self->{channel}, 1018 channel => $self->{channel},
748 challenge => $challenge, 1019 black => $info->{black},
1020 white => $info->{white},
1021 gametype => $info->{gametype},
1022 cid => $info->{cid},
1023 rules => $info->{rules},
749 ); 1024 );
750 }); 1025 });
751 if (exists $self->{challenge}{""}) { 1026 if (exists $self->{challenge}{""}) {
752 $inlay->append_button ("Reject", sub { 1027 $inlay->append_button ("Reject", sub {
753 $inlay->clear; 1028 $inlay->clear;
754 $self->send (reject_challenge => 1029 $self->send (reject_challenge =>
755 channel => $self->{channel}, 1030 channel => $self->{channel},
756 name => $opponent->{name}, 1031 name => $opponent->{name},
1032 gametype => $info->{gametype},
1033 cid => $info->{cid},
1034 rules => $info->{rules},
757 ); 1035 );
758 }); 1036 });
759 } 1037 }
760 } 1038 }
761} 1039}
762 1040
763sub draw_users { 1041sub new_game_challenge {
764 my ($self, $inlay) = @_; 1042 my ($self) = @_;
765 1043
766 for (sort keys %{$self->{users}}) { 1044 my $d = $self->{app}{defaults};
767 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>"); 1045
1046 $self->{challenge}{""} = {
1047 gametype => $d->{gametype},
1048 flags => 0,
1049 notes => $d->{stones},
1050 rules => {
1051 ruleset => $d->{ruleset},
1052 size => $d->{size},
1053 timesys => $d->{timesys},
1054 time => $d->{time},
1055 interval => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_time} : $d->{can_time},
1056 count => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_periods} : $d->{can_stones},
1057 },
1058
1059 inlay => $self->{chat}->new_inlay,
768 } 1060 };
1061 $self->draw_challenge ("");
769} 1062}
770 1063
771sub event_challenge { 1064sub event_challenge {
772 my ($self, $challenge) = @_; 1065 my ($self, $info) = @_;
773 1066
774 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name}; 1067 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
775 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1}; 1068 my $opponent = $as_black ? $info->{white} : $info->{black};
776 1069
777 my $id = $opponent->{name}; 1070 my $id = $opponent->{name};
778 1071
1072 sound::play 2, "info";
1073
779 $self->{challenge}{$id} = $challenge; 1074 $self->{challenge}{$id} = $info;
780 $self->{chat}->new_switchable_inlay ( 1075 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
781 exists $self->{challenge}{""} ? "Challenge from $opponent->{name}" : "Challenge to $opponent->{name}", 1076 exists $self->{challenge}{""}
1077 ? "Challenge from " . $opponent->as_string
1078 : "Challenge to " . $opponent->as_string,
782 sub { 1079 sub {
783 $self->{challenge}{$id}{inlay} = $_[0]; 1080 $self->{challenge}{$id}{inlay} = $_[0];
784 $self->draw_challenge ($id); 1081 $self->draw_challenge ($id);
785 }, 1082 },
786 !exists $self->{challenge}{""} # only open when not offerer 1083 !exists $self->{challenge}{""} # only open when not offerer

Diff Legend

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