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

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

Diff Legend

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.103 by pcg, Sun May 30 06:53:29 2004 UTC vs.
Revision 1.127 by root, Thu Jun 3 03:46:21 2004 UTC