[ViewVC] Diff of: cvs/kgsueme/kgsueme/game.pl

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.97 by pcg, Sat May 29 06:38:27 2004 UTC vs.
Revision 1.114 by root, Tue Jun 1 12:46:54 2004 UTC

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

Diff Legend

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

Comparing kgsueme/kgsueme/game.pl (file contents): Revision 1.97 by pcg, Sat May 29 06:38:27 2004 UTC vs. Revision 1.114 by root, Tue Jun 1 12:46:54 2004 UTC

Diff Legend

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.97 by pcg, Sat May 29 06:38:27 2004 UTC vs.
Revision 1.114 by root, Tue Jun 1 12:46:54 2004 UTC