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

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

Diff Legend

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.104 by pcg, Sun May 30 07:24:06 2004 UTC vs.
Revision 1.135 by root, Tue Jun 8 17:35:00 2004 UTC