[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.126 by root, Wed Jun 2 12:23:35 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
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);
…		…
268	for COLOUR_WHITE, COLOUR_BLACK;	277	for COLOUR_WHITE, COLOUR_BLACK;
269		278
270	$vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);	279	$vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
271		280
272	$buttonbox->add ($self->{button_pass} =	281	$buttonbox->add ($self->{button_pass} =
273	Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0));	282	Gtk2::Button->Glib::Object::new (label => "Pass", visible => 0));
274	$self->{button_pass}->signal_connect (clicked => sub {	283	$self->{button_pass}->signal_connect (clicked => sub {
275	$self->{board_click}->(255, 255) if $self->{board_click};	284	$self->{board_click}->(255, 255) if $self->{board_click};
276	});	285	});
		286	eval { $self->{button_pass}->set (no_show_all => 1) }; # workaround for gtk+-2.2
277	$buttonbox->add ($self->{button_undo} =	287	$buttonbox->add ($self->{button_undo} =
278	Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0));	288	Gtk2::Button->Glib::Object::new (label => "Undo", visible => 0));
279	$self->{button_undo}->signal_connect (clicked => sub {	289	$self->{button_undo}->signal_connect (clicked => sub {
280	$self->send (req_undo => channel => $self->{channel});	290	$self->send (req_undo => channel => $self->{channel});
281	});	291	});
		292	eval { $self->{button_undo}->set (no_show_all => 1) }; # workaround for gtk+-2.2
282	$buttonbox->add ($self->{button_resign} =	293	$buttonbox->add ($self->{button_resign} =
283	Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0));	294	Gtk2::Button->Glib::Object::new (label => "Resign", visible => 0));
284	$self->{button_resign}->signal_connect (clicked => sub {	295	$self->{button_resign}->signal_connect (clicked => sub {
285	$self->send (resign_game => channel => $self->{channel}, player => $self->{colour});	296	$self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
286	});	297	});
		298	eval { $self->{button_resign}->set (no_show_all => 1) }; # workaround for gtk+-2.2
287		299
288	$vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);	300	$vbox->pack_start (($self->{chat} = new chat), 1, 1, 0);
289		301
290	$self->set_channel ($self->{channel});	302	$self->set_channel ($self->{channel});
291		303
292	$self->show_all;	304	$self->show_all;
293		305
…		…
315	}	327	}
316	});	328	});
317	}	329	}
318	}	330	}
319		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
320	sub event_update_users {	380	sub event_update_users {
321	my ($self, $add, $update, $remove) = @_;	381	my ($self, $add, $update, $remove) = @_;
322		382
323	# $self->{userlist}->update ($add, $update, $remove);	383	# $self->{userlist}->update ($add, $update, $remove);
324		384
…		…
331	$important{$self->{black}{name}}++;	391	$important{$self->{black}{name}}++;
332	$important{$self->{white}{name}}++;	392	$important{$self->{white}{name}}++;
333	$important{$self->{owner}{name}}++;	393	$important{$self->{owner}{name}}++;
334		394
335	if (my @users = grep $important{$_->{name}}, @$add) {	395	if (my @users = grep $important{$_->{name}}, @$add) {
336	$self->{chat}->append_text ("\n<header>Joins:</header>");	396	$self->{chat}->append_text ("\n<leader>Joins:</leader>");
337	$self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;	397	$self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
338	}	398	}
339	if (my @users = grep $important{$_->{name}}, @$remove) {	399	if (my @users = grep $important{$_->{name}}, @$remove) {
340	$self->{chat}->append_text ("\n<header>Parts:</header>");	400	$self->{chat}->append_text ("\n<leader>Parts:</leader>");
341	$self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;	401	$self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
342	}	402	}
343	}	403	}
344		404
345	sub join {	405	### GAME INFO ###############################################################
		406
		407	sub draw_setup {
346	my ($self) = @_;	408	my ($self, $inlay) = @_;
		409
347	return if $self->{joined};	410	return unless $self->{joined};
348		411
349	$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}};
350	}	560	}
351		561
352	sub update_cursor {	562	sub update_cursor {
353	my ($self) = @_;	563	my ($self) = @_;
		564
		565	return unless $self->{cur_board};
354		566
355	my $running = $self->{showmove} == @{$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", visible => 1, sensitive => 1);
362	$self->{button_undo}->hide;	574	$self->{button_undo}->hide;
363	$self->{button_resign}->hide;	575	$self->{button_resign}->hide;
364	$self->{board}->set (cursor => undef);	576	$self->{board}->set (cursor => undef);
365		577
366	} elsif ($running && $self->{colour} != COLOUR_NONE) {	578	} elsif ($running && $self->{colour} != COLOUR_NONE) {
…		…
368	$self->{button_undo}->show;	580	$self->{button_undo}->show;
369	$self->{button_resign}->show;	581	$self->{button_resign}->show;
370		582
371	if ($self->{cur_board}{score}) {	583	if ($self->{cur_board}{score}) {
372	# during scoring	584	# during scoring
373	$self->{button_pass}->set (label => "Done", sensitive => 1, visible => 1);	585	$self->{button_pass}->set (label => "Done", visible => 1, sensitive => 1);
374	$self->{board}->set (cursor => sub {	586	$self->{board}->set (cursor => sub {
375	$_[0] & (MARK_B \| MARK_W)	587	$_[0] & (MARK_B \| MARK_W)
376	? $_[0] ^ MARK_GRAYED	588	? $_[0] ^ MARK_GRAYED
377	: $_[0];	589	: $_[0];
378	});	590	});
…		…
388	dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),	600	dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
389	);	601	);
390	}	602	}
391	};	603	};
392		604
393	} elsif (1 - $self->{colour} == $self->{cur_board}{last}) {	605	} elsif ($self->{colour} == $self->{whosemove}) {
394	# normal move	606	# normal move
395	$self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1);	607	$self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
396	$self->{board}->set (cursor => sub {	608	$self->{board}->set (cursor => sub {
397	# if is_valid_move oder so#TODO#	609	$self->{cur_board}
398	$_[0] & (MARK_B \| MARK_W)	610	&& $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
399	? $_[0]	611	$self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
400	: $_[0] \| MARK_GRAYED \| ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B);	612	? $_[0] \| MARK_GRAYED \| ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
		613	: $_[0];
401	});	614	});
402	$self->{board_click} = sub {	615	$self->{board_click} = sub {
		616	return unless
		617	$self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
		618	$self->{rules}{ruleset} == RULESET_NEW_ZEALAND);
403	$self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);	619	$self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
404	$self->{board}->set (cursor => undef);	620	$self->{board}->set (cursor => undef);
405	delete $self->{board_click};	621	delete $self->{board_click};
406	$self->{button_pass}->sensitive (0);	622	$self->{button_pass}->sensitive (0);
407	};	623	};
408	} else {	624	} else {
409	$self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);	625	$self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
		626	$self->{board}->set (cursor => undef);
410	}	627	}
411	} else {	628	} else {
412	$self->{button_undo}->hide;	629	$self->{button_undo}->hide;
413	$self->{button_resign}->hide;	630	$self->{button_resign}->hide;
414	$self->{button_pass}->hide;	631	$self->{button_pass}->hide;
415	$self->{board}->set (cursor => undef);	632	$self->{board}->set (cursor => undef);
416	#TODO# # implement coordinate-grabbing	633	#TODO# # implement coordinate-grabbing
417	}	634	}
418	}	635	}
419		636
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 {	637	sub update_board {
434	my ($self) = @_;	638	my ($self) = @_;
		639
435	return unless $self->{path};	640	return unless $self->{path};
436		641
437	$self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));	642	$self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
438		643
439	$self->{cur_board} = new KGS::Game::Board $self->{size};	644	$self->{cur_board} = new KGS::Game::Board $self->{size};
440	$self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);	645	$self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
441		646
		647	if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
		648	if ($self->{curnode}{move} == 0) {
		649	$self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
		650	} else {
		651	$self->{whosemove} = 1 - $self->{cur_board}{last};
		652	}
		653	} else {
		654	# Chinese, Aga, NZ all have manual placement
		655	if ($self->{curnode}{move} < $self->{handicap}) {
		656	$self->{whosemove} = COLOUR_BLACK;
		657	} elsif ($self->{curnode}{move} == $self->{handicap}) {
		658	$self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
		659	} else {
		660	$self->{whosemove} = 1 - $self->{cur_board}{last};
		661	}
		662	}
		663
442	$self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])	664	$self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
443	for COLOUR_WHITE, COLOUR_BLACK;	665	for COLOUR_WHITE, COLOUR_BLACK;
		666
		667	my $start_time = $self->{rules}{time};
444		668
445	if ($self->{showmove} == @{$self->{path}}) {	669	if ($self->{showmove} == @{$self->{path}}) {
446	$self->{timers} = [	670	$self->{timers} = [
447	[$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],	671	[$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
448	[$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],	672	[$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
…		…
455	]);	679	]);
456	}	680	}
457		681
458	$self->{board}->set_board ($self->{cur_board});	682	$self->{board}->set_board ($self->{cur_board});
459		683
		684	if ($self->{cur_board}{score}) {
		685	$self->{score_inlay} \|\|= $self->{chat}->new_inlay;
		686	$self->{score_inlay}->clear;
		687	$self->{score_inlay}->append_text ("\n<header>Scoring</header>"
		688	. "\n<score>"
		689	. "White: $self->{cur_board}{score}[COLOUR_WHITE], "
		690	. "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
		691	. "</score>");
		692	} elsif ($self->{score_inlay}) {
		693	(delete $self->{score_inlay})->clear;
		694	}
		695
460	$self->update_cursor;	696	$self->update_cursor;
		697
461	}	698	}
462		699
463	sub event_update_tree {	700	sub event_update_tree {
464	my ($self) = @_;	701	my ($self) = @_;
		702
		703	(delete $self->{undo_inlay})->clear
		704	if $self->{undo_inlay};
465		705
466	$self->{path} = $self->get_path;	706	$self->{path} = $self->get_path;
467		707
468	if ($self->{moveadj}) {	708	if ($self->{moveadj}) {
469	my $upper = $self->{moveadj}->upper;	709	my $upper = $self->{moveadj}->upper;
…		…
515	}	755	}
516		756
517	$self->{chat}->append_text ($text);	757	$self->{chat}->append_text ($text);
518	}	758	}
519		759
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 {	760	sub event_move {
536	my ($self, $pass) = @_;	761	my ($self, $pass) = @_;
		762
537	sound::play 1, $pass ? "pass" : "move";	763	sound::play 1, $pass ? "pass" : "move";
538
539	if ($self->{undo_inlay}) {
540	(delete $self->{undo_inlay})->clear;
541	}
542	}	764	}
543		765
544	sub event_update_game {	766	### 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		767
659	sub event_resign_game {	768	sub event_resign_game {
660	my ($self, $player) = @_;	769	my ($self, $player) = @_;
661		770
662	sound::play 3, "resign";	771	sound::play 3, "resign";
663	$self->{chat}->append_text ("\n<infoblock><header>Resign</header>"	772	$self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
664	. "\n<user>"	773	. "\n<user>"
665	. (util::toxml $self->{user}[$msg->{player}]->as_string)	774	. (util::toxml $self->{user}[$msg->{player}]->as_string)
666	. "</user> resigned.</infoblock>");	775	. "</user> resigned."
		776	. "\n<user>"
		777	. (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
		778	. "</user> wins the game."
		779	. "</infoblock>");
667	}	780	}
668		781
669	sub event_out_of_time {	782	sub event_time_win {
670	my ($self, $player) = @_;	783	my ($self, $player) = @_;
671		784
672	sound::play 3, "timewin";	785	sound::play 3, "timewin";
673	$self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"	786	$self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
674	. "\n<user>"	787	. "\n<user>"
		788	. (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
		789	. "</user> ran out of time and lost."
		790	. "\n<user>"
675	. (util::toxml $self->{user}[$msg->{player}]->as_string)	791	. (util::toxml $self->{user}[$msg->{player}]->as_string)
		792	. "</user> wins the game."
		793	. "</infoblock>");
		794	}
		795
		796	sub event_owner_left {
		797	my ($self) = @_;
		798
		799	$self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
676	. "</user> ran out of time and lost.</infoblock>");	800	. "\nThe owner of this game left.</infoblock>");
		801	}
		802
		803	sub event_teacher_left {
		804	my ($self) = @_;
		805
		806	$self->{chat}->append_text ("\n<infoblock><header>Teacher left</header>"
		807	. "\nThe teacher left the game.</infoblock>");
677	}	808	}
678		809
679	sub event_done {	810	sub event_done {
680	my ($self) = @_;	811	my ($self) = @_;
681		812
682	if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {	813	if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
		814	sound::play 2, "info" unless $inlay->{count};
683	$self->{chat}->append_text ("\n<infoblock><header>Done</header>"	815	$self->{chat}->append_text ("\n<infoblock><header>Press Done</header>"
684	. "\nYour opponent pressed done.");	816	. "\nYour opponent pressed done. Now it's up to you.");
685	}	817	}
		818	if ($self->{doneid} & 0x80000000) {
		819	sound::play 2, "info" unless $inlay->{count};
		820	$self->{chat}->append_text ("\n<infoblock><header>Press Done Again</header>"
		821	. "\nThe board has changed.");
		822	}
		823
		824	$self->{button_pass}->sensitive (!$self->{done}[$self->{colour}]);
		825
		826	$self->{chat}->set_end;
686	}	827	}
687		828
688	sub inject_final_result {	829	sub inject_final_result {
689	my ($self, $msg) = @_;	830	my ($self, $msg) = @_;
690		831
…		…
693	. "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)	834	. "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
694	. "</infoblock>"	835	. "</infoblock>"
695	);	836	);
696	}	837	}
697		838
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 {	839	sub inject_req_undo {
712	my ($self, $msg) = @_;	840	my ($self, $msg) = @_;
713		841
714	my $inlay = $self->{undo_inlay} \|\|= $self->{chat}->new_inlay;	842	my $inlay = $self->{undo_inlay} \|\|= $self->{chat}->new_inlay;
715	return if $inlay->{ignore};	843	return if $inlay->{ignore};
716		844
717	sound::play 3, "warning" unless $inlay->{count};	845	sound::play 2, "warning" unless $inlay->{count};
718	$inlay->{count}++;	846	$inlay->{count}++;
719		847
720	$inlay->clear;	848	$inlay->clear;
721	$inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");	849	$inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
722	$inlay->append_button ("Grant", sub {	850	$inlay->append_button ("Grant", sub {
723	$inlay->clear;	851	(delete $self->{undo_inlay})->clear;
724	$self->send (grant_undo => channel => $self->{channel});	852	$self->send (grant_undo => channel => $self->{channel});
725	});	853	});
726	$inlay->append_button ("Ignore", sub {	854	$inlay->append_button ("Ignore", sub {
727	$inlay->clear;	855	$inlay->clear;
728	$inlay->{ignore} = 1;	856	$inlay->{ignore} = 1;
…		…
733	}	861	}
734		862
735	sub inject_new_game {	863	sub inject_new_game {
736	my ($self, $msg) = @_;	864	my ($self, $msg) = @_;
737		865
738	$self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>");	866	if ($msg->{cid} != $self->{cid}) {
		867	$self->part;
		868	warn "ERROR: challenge id mismatch, PLEASE REPORT, especially the circumstances (many games open? etc..)\n";#d#
		869	}
		870
		871	$self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
739	delete $self->{cid};	872	delete $self->{cid};
740	}	873	}
		874
		875	### CHALLENGE HANDLING ######################################################
741		876
742	sub draw_challenge {	877	sub draw_challenge {
743	my ($self, $id) = @_;	878	my ($self, $id) = @_;
744		879
745	my $info = $self->{challenge}{$id};	880	my $info = $self->{challenge}{$id};
…		…
747	my $rules = $info->{rules};	882	my $rules = $info->{rules};
748		883
749	my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;	884	my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
750	my $opponent = $as_black ? $info->{white} : $info->{black};	885	my $opponent = $as_black ? $info->{white} : $info->{black};
751		886
752	my ($size, $time, $interval, $count);	887	my ($size, $time, $interval, $count, $type);
753		888
754	if (!$self->{channel}) {	889	if (!$self->{channel}) {
755	$inlay->append_text ("\nNotes: ");	890	$inlay->append_text ("\nNotes: ");
756	$inlay->append_entry (\$info->{notes}, 20, "");	891	$inlay->append_widget (gtk::textentry \$info->{notes}, 20, "");
757	$inlay->append_text ("\nGlobal Offer: ");	892	$inlay->append_text ("\nGlobal Offer: ");
758	$inlay->append_optionmenu (\$info->{flags},	893	$inlay->append_optionmenu (\$info->{flags},
759	0 => "No",	894	0 => "No",
760	2 => "Yes",	895	2 => "Yes",
761	);	896	);
762	} else {	897	} else {
763	$inlay->append_text ("\nNotes: " . util::toxml $info->{notes});	898	$inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
764	}	899	}
765		900
766	$inlay->append_text ("\nType: ");	901	$inlay->append_text ("\nType: ");
767	$inlay->append_optionmenu (	902	$type = $inlay->append_optionmenu (
768	\$info->{gametype},	903	\$info->{gametype},
769	GAMETYPE_DEMONSTRATION , "Demonstration",	904	GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
770	GAMETYPE_DEMONSTRATION \| GAMETYPE_PRIVATE, "Demonstration (P)",	905	GAMETYPE_DEMONSTRATION \| GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
771	GAMETYPE_TEACHING , "Teaching",	906	GAMETYPE_TEACHING , "Teaching (not yet)",
772	GAMETYPE_TEACHING \| GAMETYPE_PRIVATE, "Teaching (P)",	907	GAMETYPE_TEACHING \| GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
773	GAMETYPE_SIMUL , "Simul (not yet!)",	908	GAMETYPE_SIMUL , "Simul (not yet!)",
774	GAMETYPE_FREE , "Free",	909	GAMETYPE_FREE , "Free",
775	GAMETYPE_RATED , "Rated",	910	GAMETYPE_RATED , "Rated",
776	sub {	911	sub {
777	$size->set_history (2) if $_[0] eq GAMETYPE_RATED;	912	$size->set_history (2) if $_[0] eq GAMETYPE_RATED;
…		…
801	RULESET_NEW_ZEALAND, "New Zealand",	936	RULESET_NEW_ZEALAND, "New Zealand",
802	);	937	);
803		938
804	$inlay->append_text ("\nSize: ");	939	$inlay->append_text ("\nSize: ");
805	$size = $inlay->append_optionmenu (	940	$size = $inlay->append_optionmenu (
		941	\$info->{rules}{size},
806	\$info->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38	942	(9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38),
		943	sub {
		944	$type->set_history (5) # reset to free
		945	if $_[0] != 19 && $info->{gametype} == GAMETYPE_RATED;
		946	},
807	);	947	);
808		948
809	if ($self->{channel}) {	949	if ($self->{channel}) {
810	$inlay->append_text ("\nHandicap: ");	950	$inlay->append_text ("\nHandicap: ");
811	$inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);	951	$inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
812		952
813	$inlay->append_text ("\nKomi: ");	953	$inlay->append_text ("\nKomi: ");
814	$inlay->append_entry (\$info->{rules}{komi}, 5);	954	$inlay->append_widget (gtk::numentry \$info->{rules}{komi}, 5);
815	}	955	}
816		956
817	$inlay->append_text ("\nTimesys: ");	957	$inlay->append_text ("\nTimesys: ");
818	$inlay->append_optionmenu (	958	$inlay->append_optionmenu (
819	\$info->{rules}{timesys},	959	\$info->{rules}{timesys},
…		…
848	}	988	}
849	}	989	}
850	);	990	);
851		991
852	$inlay->append_text ("\nMain Time: ");	992	$inlay->append_text ("\nMain Time: ");
853	$time = $inlay->append_entry (\$info->{rules}{time}, 5);	993	$time = $inlay->append_widget (gtk::timeentry \$info->{rules}{time}, 5);
854	$inlay->append_text ("\nInterval: ");	994	$inlay->append_text ("\nInterval: ");
855	$interval = $inlay->append_entry (\$info->{rules}{interval}, 3);	995	$interval = $inlay->append_widget (gtk::timeentry \$info->{rules}{interval}, 5);
856	$inlay->append_text ("\nPeriods/Stones: ");	996	$inlay->append_text ("\nPeriods/Stones: ");
857	$count = $inlay->append_entry (\$info->{rules}{count}, 2);	997	$count = $inlay->append_widget (gtk::numentry \$info->{rules}{count}, 5);
858		998
859	$inlay->append_text ("\n");	999	$inlay->append_text ("\n");
860		1000
861	if (!$self->{channel}) {	1001	if (!$self->{channel}) {
862	$inlay->append_button ("Create Challenge", sub {	1002	$inlay->append_button ("Create Challenge", sub {
…		…
896	});	1036	});
897	}	1037	}
898	}	1038	}
899	}	1039	}
900		1040
901	sub draw_users {	1041	sub new_game_challenge {
902	my ($self, $inlay) = @_;	1042	my ($self) = @_;
903		1043
904	for (sort keys %{$self->{users}}) {	1044	my $d = $self->{app}{defaults};
905	$inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");	1045
		1046	$self->{challenge}{""} = {
		1047	gametype => $d->{gametype},
		1048	flags => 0,
		1049	notes => $d->{stones},
		1050	rules => {
		1051	ruleset => $d->{ruleset},
		1052	size => $d->{size},
		1053	timesys => $d->{timesys},
		1054	time => $d->{time},
		1055	interval => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_time} : $d->{can_time},
		1056	count => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_periods} : $d->{can_stones},
		1057	},
		1058
		1059	inlay => $self->{chat}->new_inlay,
906	}	1060	};
		1061	$self->draw_challenge ("");
907	}	1062	}
908		1063
909	sub event_challenge {	1064	sub event_challenge {
910	my ($self, $info) = @_;	1065	my ($self, $info) = @_;
911		1066
912	my $as_black = $info->{black}->{name} eq $self->{conn}{name};	1067	my $as_black = $info->{black}->{name} eq $self->{conn}{name};
913	my $opponent = $as_black ? $info->{white} : $info->{black};	1068	my $opponent = $as_black ? $info->{white} : $info->{black};
914		1069
915	my $id = $opponent->{name};	1070	my $id = $opponent->{name};
		1071
		1072	sound::play 2, "info";
916		1073
917	$self->{challenge}{$id} = $info;	1074	$self->{challenge}{$id} = $info;
918	$self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (	1075	$self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
919	exists $self->{challenge}{""}	1076	exists $self->{challenge}{""}
920	? "Challenge from $opponent->{name}"	1077	? "Challenge from " . $opponent->as_string
921	: "Challenge to $opponent->{name}",	1078	: "Challenge to " . $opponent->as_string,
922	sub {	1079	sub {
923	$self->{challenge}{$id}{inlay} = $_[0];	1080	$self->{challenge}{$id}{inlay} = $_[0];
924	$self->draw_challenge ($id);	1081	$self->draw_challenge ($id);
925	},	1082	},
926	!exists $self->{challenge}{""} # only open when not offerer	1083	!exists $self->{challenge}{""} # only open when not offerer

Diff Legend

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

Comparing kgsueme/kgsueme/game.pl (file contents): Revision 1.104 by pcg, Sun May 30 07:24:06 2004 UTC vs. Revision 1.126 by root, Wed Jun 2 12:23:35 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.126 by root, Wed Jun 2 12:23:35 2004 UTC