ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/kgsueme/kgsueme/game.pl

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.57 by pcg, Sat Jun 14 11:53:24 2003 UTC vs.
Revision 1.106 by root, Mon May 31 01:07:48 2004 UTC

1	use utf8;	1	use utf8;
		2
		3	use Scalar::Util ();
2		4
3	package game::goclock;	5	package game::goclock;
4		6
5	# Lo and Behold! I admit it! The rounding stuff etc.. in goclock	7	# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6	# is completely borked.	8	# is completely borked.
7		9
8	use Time::HiRes ();	10	use Time::HiRes ();
9		11
10	use KGS::Constants;	12	use KGS::Constants;
11		13
12	use base gtk::widget;	14	use Glib::Object::Subclass
		15	Gtk2::Label;
13		16
14	sub new {	17	sub INIT_INSTANCE {
15	my $class = shift;	18	my $self = shift;
16	my $self = $class->SUPER::new(@_);
17		19
18	$self->{widget} = new Gtk2::Label;	20	$self->signal_connect (destroy => sub { $_[0]->stop });
19		21
20	$self->{set} = sub { };	22	$self->{set} = sub { };
21	$self->{format} = sub { "ERROR" };	23	$self->{format} = sub { "???" };
		24	}
22		25
		26	sub FINALIZE_INSTANCE {
		27	my $self = shift;
		28
23	$self;	29	$self->stop;
24	}	30	}
25		31
26	sub configure {	32	sub configure {
27	my ($self, $timesys, $main, $interval, $count) = @_;	33	my ($self, $timesys, $main, $interval, $count) = @_;
28		34
29	if ($timesys == TIMESYS_ABSOLUTE) {	35	if ($timesys == TIMESYS_ABSOLUTE) {
30	$self->{set} = sub { $self->{time} = $_[0] };	36	$self->{format} = sub {
31	$self->{format} = sub { util::format_time $_[0] };	37	if ($_[0] <= 0) {
		38	"TIMEOUT";
		39	} else {
		40	util::format_time $_[0];
		41	}
		42	};
32		43
33	} elsif ($timesys == TIMESYS_BYO_YOMI) {	44	} elsif ($timesys == TIMESYS_BYO_YOMI) {
34	my $low = $interval * $count;	45	my $low = $interval * $count;
35		46
36	$self->{set} = sub { $self->{time} = $_[0] };
37
38	$self->{format} = sub {	47	$self->{format} = sub {
		48	if ($_[0] <= 0) {
		49	"TIMEOUT";
39	if ($_[0] > $low) {	50	} elsif ($_[0] > $low) {
40	util::format_time $_[0] - $low;	51	util::format_time $_[0] - $low;
41	} else {	52	} else {
42	sprintf "%s (%d)",	53	sprintf "%s (%d)",
43	util::format_time int (($_[0] - 1) % $interval + 1),	54	util::format_time int (($_[0] - 1) % $interval + 1),
44	($_[0] - 1) / $interval;	55	($_[0] - 1) / $interval;
45	}	56	}
46	};	57	};
47		58
48	} elsif ($timesys == TIMESYS_CANADIAN) {	59	} elsif ($timesys == TIMESYS_CANADIAN) {
49	$self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
50
51	$self->{format} = sub {	60	$self->{format} = sub {
		61	if ($_[0] <= 0) {
		62	"TIMEOUT";
52	if (!$self->{moves}) {	63	} elsif (!$self->{moves}) {
53	util::format_time $_[0] - $low;	64	util::format_time $_[0] - $low;
54	} else {	65	} else {
55	my $time = int (($_[0] - 1) % $interval + 1);	66	my $time = int (($_[0] - 1) % $interval + 1);
56		67
57	sprintf "%s/%d [%d]",	68	sprintf "%s/%d =%d",
58	util::format_time $time,	69	util::format_time $time,
59	$self->{moves},	70	$self->{moves},
		71	$self->{moves} > 1
60	$time / ($self->{moves} || 1);	72	? $time / $self->{moves}
61		73	: $interval;
62	}	74	}
63	};	75	};
64		76
65	} else {	77	} else {
66	# none, or unknown	78	# none, or unknown
67	$self->{set} = sub { };
68	$self->{format} = sub { "---" }	79	$self->{format} = sub { "-" }
69	}	80	}
70	}	81	}
71		82
72	sub refresh {	83	sub refresh {
73	my ($self, $timestamp) = @_;	84	my ($self, $timestamp) = @_;
74	my $timer = $self->{time} + $self->{start} - $timestamp;	85	my $timer = $self->{time} + $self->{start} - $timestamp;
75		86
76	# we round the timer value slightly... the protocol isn't exact anyways,	87	# we round the timer value slightly... the protocol isn't exact anyways,
77	# and this gives smoother timers ;)	88	# and this gives smoother timers ;)
78	my @format = $self->{format}->(int ($timer + 0.4));	89	my $timer2 = int $timer + 0.4;
		90
79	$self->{widget}->set_text ($self->{format}->(int ($timer + 0.4)));	91	$self->set_text ($self->{format}->($timer2));
80		92
81	$timer - int $timer;	93	$timer - int $timer;
82	}	94	}
83		95
84	sub set_time {	96	sub set_time {
85	my ($self, $time) = @_;	97	my ($self, $start, $time, $moves) = @_;
86		98
87	# we ignore requests to re-set the time of a running clock.	99	$self->{time} = $time;
88	# this is the easiest way to ensure that commentary etc.	100	$self->{moves} = $moves;
89	# doesn't re-set the clock. yes, this is frickle design,	101
90	# but I think the protocol is to blame here, which gives	102	if ($start) {
91	# very little time information. (cgoban2 also has had quite	103	$self->{start} = $start;
92	# a lot of small time update problems...)	104	$self->start;
93	unless ($self->{timeout}) {	105	} else {
94	$self->{set}->($time->[0], $time->[1]);	106	$self->stop;
95	$self->refresh ($self->{start});	107	$self->refresh ($self->{start});
96	}	108	}
97	}	109	}
98		110
99	sub start {	111	sub start {
100	my ($self, $when) = @_;	112	my ($self) = @_;
101		113
102	$self->stop;	114	$self->stop;
103
104	$self->{start} = $when;
105		115
106	my $timeout; $timeout = sub {	116	my $timeout; $timeout = sub {
107	my $next = $self->refresh (Time::HiRes::time) * 1000;	117	my $next = $self->refresh (Time::HiRes::time) * 1000;
108	$next += 1000 if $next < 0;	118	$next += 1000 if $next < 0;
109	$self->{timeout} = add Glib::Timeout $next, $timeout;	119	$self->{timeout} = add Glib::Timeout $next, $timeout;
…		…
117	my ($self) = @_;	127	my ($self) = @_;
118		128
119	remove Glib::Source delete $self->{timeout} if $self->{timeout};	129	remove Glib::Source delete $self->{timeout} if $self->{timeout};
120	}	130	}
121		131
122	sub destroy {
123	my ($self) = @_;
124	$self->stop;
125	$self->SUPER::destroy;
126	}
127
128	package game::userpanel;	132	package game::userpanel;
129		133
130	use base gtk::widget;	134	use Glib::Object::Subclass
		135	Gtk2::HBox,
		136	properties => [
		137	Glib::ParamSpec->IV ("colour", "colour", "User Colour", 0, 1, 0, [qw(construct-only writable)]),
		138	];
131		139
132	sub new {	140	sub INIT_INSTANCE {
133	my $class = shift;	141	my ($self) = @_;
134	my $self = $class->SUPER::new(@_);
135		142
136	$self->{widget} = new Gtk2::HBox;
137
138	$self->{widget}->add (my $vbox = new Gtk2::VBox);	143	$self->add (my $vbox = new Gtk2::VBox);
139		144
140	$vbox->add ($self->{name} = new Gtk2::Label $self->{name});	145	$vbox->add ($self->{name} = new Gtk2::Label $self->{name});
141	$vbox->add ($self->{info} = new Gtk2::Label "");	146	$vbox->add ($self->{info} = new Gtk2::Label "");
142	$vbox->add (($self->{clock} = new game::goclock)->widget);	147	$vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock};
143		148
144	$vbox->add ($self->{imagebox} = new Gtk2::VBox);	149	$vbox->add ($self->{imagebox} = new Gtk2::VBox);
145		150
146	$self;	151	$self;
147	}	152	}
148		153
149	sub configure {	154	sub configure {
150	my ($self, $user, $rules) = @_;	155	my ($self, $app, $user, $rules) = @_;
151		156
152	if ($self->{name}->get_text ne $user->as_string) {	157	if ($self->{name}->get_text ne $user->as_string) {
153	$self->{name}->set_text ($user->as_string);	158	$self->{name}->set_text ($user->as_string);
154		159
155	$self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;	160	$self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
156	$self->{imagebox}->add (gtk::image_from_data undef);	161	$self->{imagebox}->add (gtk::image_from_data undef);
157	$self->{imagebox}->show_all;	162	$self->{imagebox}->show_all;
158		163
159	if ($user->has_pic) {	164	if ($user->has_pic) {
160	# the big picture...	165	# the big picture...
161	appwin::userpic ($user->{name}, sub {	166	$app->userpic ($user->{name}, sub {
162	return unless $self->{imagebox};	167	return unless $self->{imagebox};
		168
163	if ($_[0]) {	169	if ($_[0]) {
164	$self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;	170	$self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
165	$self->{imagebox}->add (gtk::image_from_data $_[0]);	171	$self->{imagebox}->add (gtk::image_from_data $_[0]);
166	$self->{imagebox}->show_all;	172	$self->{imagebox}->show_all;
167	}	173	}
…		…
170	}	176	}
171		177
172	$self->{clock}->configure (@{$rules}{qw(timesys time interval count)});	178	$self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
173	}	179	}
174		180
175	sub set_state {	181	sub set_captures {
176	my ($self, $captures, $timer, $when) = @_;	182	my ($self, $captures) = @_;
177
178	$self->{clock}->stop unless $when;
179	$self->{clock}->set_time ($timer);
180	$self->{clock}->start ($when) if $when;
181		183
182	$self->{info}->set_text ("$captures pris.");	184	$self->{info}->set_text ("$captures pris.");
183	}	185	}
184		186
		187	sub set_timer {
		188	my ($self, $start, $time, $moves) = @_;
		189
		190	$self->{clock}->set_time ($start, $time, $moves);
		191	}
		192
185	package game;	193	package game;
		194
		195	use Scalar::Util qw(weaken);
186		196
187	use KGS::Constants;	197	use KGS::Constants;
188	use KGS::Game::Board;	198	use KGS::Game::Board;
189		199
		200	use Gtk2::GoBoard;
		201	use Gtk2::GoBoard::Constants;
		202
		203	use base KGS::Game;
190	use base KGS::Listener::Game;	204	use base KGS::Listener::Game;
191	use base KGS::Game;
192		205
193	use base gtk::widget;	206	use Glib::Object::Subclass
		207	Gtk2::Window;
194		208
195	use POSIX qw(ceil);	209	use POSIX qw(ceil);
196		210
197	sub new {	211	sub new {
198	my $self = shift;	212	my ($self, %arg) = @_;
199	$self = $self->SUPER::new(@_);	213	$self = $self->Glib::Object::new;
		214	$self->{$_} = delete $arg{$_} for keys %arg;
200		215
201	$self->listen($self->{conn});
202
203	$self->{window} = new Gtk2::Window 'toplevel';
204	gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];	216	gtk::state $self, "game::window", undef, window_size => [600, 500];
205		217
206	$self->{window}->signal_connect(delete_event => sub {	218	$self->signal_connect (destroy => sub {
207	$self->part;	219	$self->unlisten;
208	$self->destroy;	220	delete $self->{app}{game}{$self->{channel}};
209	1;	221	%{$_[0]} = ();
210	});	222	});#d#
211		223
212	$self->{window}->add($self->{hpane} = new Gtk2::HPaned);	224	$self->add (my $hpane = new Gtk2::HPaned);
213	gtk::state $self->{hpane}, "game::hpane", undef, position => 500;	225	gtk::state $hpane, "game::hpane", undef, position => 500;
214		226
215	# LEFT PANE	227	# LEFT PANE
216		228
217	$self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0);	229	$hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
218		230
219	$self->{boardbox} = new Gtk2::VBox;	231	$self->{boardbox} = new Gtk2::VBox;
220		232
221	$self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);	233	$hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
222		234
223	# challenge
224
225	$self->{challenge} = new challenge channel => $self->{channel};
226
227	# board box (aspect/canvas)	235	# board box (aspect/canvas)
228		236
229	$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);	237	#$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
		238
		239	# RIGHT PANE
		240
		241	$hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
		242	$hpane->set (position_set => 1);
		243
		244	$vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
230		245
231	{	246	{
232	$frame->add(my $vbox = new Gtk2::VBox);	247	$frame->add (my $vbox = new Gtk2::VBox);
233	$vbox->add($self->{title} = new Gtk2::Label $title);	248	$vbox->add ($self->{title} = new Gtk2::Label $title);
234		249
		250	$vbox->add (my $hbox = new Gtk2::HBox);
		251
		252	$hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
		253
235	$self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 0;	254	$self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
236		255
237	$vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});	256	$hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
238	$scale->set_draw_value (0);	257	$scale->set_draw_value (0);
239	$scale->set_digits (0);	258	$scale->set_digits (0);
240		259
241	$self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });	260	$self->{moveadj}->signal_connect (value_changed => sub {
		261	$self->{showmove} = int $self->{moveadj}->get_value;
		262	$self->update_board;
		263	});
242	}	264	}
243		265
244	$self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
245	$aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
246	$self->{board_label} = $aspect_frame->get_label_widget;
247
248	$aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
249	$self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
250
251	$self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
252	$self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
253
254	# RIGHT PANE
255
256	$self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257	$self->{hpane}->set(position_set => 1);
258	gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
259
260	$self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
261	$sw->set_policy("automatic", "always");
262
263	$sw->add(($self->{userlist} = new userlist)->widget);
264
265	$self->{vpane}->add(my $vbox = new Gtk2::VBox);
266
267	$vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);	266	$vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
		267
268	$hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget);	268	$hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
269	$hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget);	269	for COLOUR_WHITE, COLOUR_BLACK;
		270
		271	$vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
		272
		273	$buttonbox->add ($self->{button_pass} =
		274	Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0));
		275	$self->{button_pass}->signal_connect (clicked => sub {
		276	$self->{board_click}->(255, 255) if $self->{board_click};
		277	});
		278	$buttonbox->add ($self->{button_undo} =
		279	Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0));
		280	$self->{button_undo}->signal_connect (clicked => sub {
		281	$self->send (req_undo => channel => $self->{channel});
		282	});
		283	$buttonbox->add ($self->{button_resign} =
		284	Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0));
		285	$self->{button_resign}->signal_connect (clicked => sub {
		286	$self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
		287	});
270		288
271	$vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0);	289	$vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
272		290
273	$vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);	291	$self->set_channel ($self->{channel});
274	$self->{entry}->signal_connect(activate => sub {
275	my $text = $self->{entry}->get_text;
276	$self->say($text) if $text =~ /\S/;
277	$self->{entry}->set_text("");
278	});
279		292
280	$self->event_update_game;	293	$self->show_all;
		294
281	$self;	295	$self;
		296	}
		297
		298	sub set_channel {
		299	my ($self, $channel) = @_;
		300
		301	$self->{channel} = $channel;
		302
		303	if ($self->{channel} > 0) {
		304	$self->listen ($self->{conn});
		305
		306	$self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
		307	$self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
		308
		309	$self->signal_connect (delete_event => sub { $self->part; 1 });
		310	$self->{chat}->signal_connect (command => sub {
		311	my ($chat, $cmd, $arg) = @_;
		312	if ($cmd eq "rsave") {
		313	Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
		314	} else {
		315	$self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
		316	}
		317	});
		318	}
282	}	319	}
283		320
284	sub event_update_users {	321	sub event_update_users {
285	my ($self, $add, $update, $remove) = @_;	322	my ($self, $add, $update, $remove) = @_;
286		323
287	$self->{userlist}->update ($add, $update, $remove);	324	# $self->{userlist}->update ($add, $update, $remove);
		325
		326	$self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
		327	for @$remove;
		328
		329	$self->{users_inlay}->refresh;
288		330
289	my %important;	331	my %important;
		332	$important{$self->{black}{name}}++;
		333	$important{$self->{white}{name}}++;
290	$important{$self->{user1}{name}}++;	334	$important{$self->{owner}{name}}++;
291	$important{$self->{user2}{name}}++;
292	$important{$self->{user3}{name}}++;
293		335
294	if (my @users = grep $important{$_->{name}}, @$add) {	336	if (my @users = grep $important{$_->{name}}, @$add) {
295	$self->{text}->append_text ("\n<header>Joins:</header>");	337	$self->{chat}->append_text ("\n<header>Joins:</header>");
296	$self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users;	338	$self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
297	}	339	}
298	if (my @users = grep $important{$_->{name}}, @$remove) {	340	if (my @users = grep $important{$_->{name}}, @$remove) {
299	$self->{text}->append_text ("\n<header>Parts:</header>");	341	$self->{chat}->append_text ("\n<header>Parts:</header>");
300	$self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users;	342	$self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
301	}	343	}
302
303	}	344	}
304		345
305	sub join {	346	sub join {
306	my ($self) = @_;	347	my ($self) = @_;
307	return if $self->{joined};	348	return if $self->{joined};
308		349
309	$self->SUPER::join;	350	$self->SUPER::join;
310
311	$self->{window}->show_all;
312	}	351	}
313		352
314	sub part {	353	sub update_cursor {
315	my ($self) = @_;	354	my ($self) = @_;
316		355
317	$self->SUPER::part;	356	my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
318	$self->destroy;
319	}
320		357
321	sub configure_event {
322	my ($widget, $event, $self) = @_;
323	delete $self->{stack};
324	delete $self->{pixbuf};
325	delete $self->{board_shown};	358	delete $self->{board_click};
326	delete $self->{background};
327	$self->repaint_board;
328	0;
329	}
330		359
331	sub expose_event {	360	if ($self->{teacher} eq $self->{app}{conn}) {
332	my ($widget, $event, $self) = @_;	361	#TODO# # teaching mode not implemented
		362	$self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1);
		363	$self->{button_undo}->hide;
		364	$self->{button_resign}->hide;
		365	$self->{board}->set (cursor => undef);
333		366
334	$self->{pixbuf} or return;	367	} elsif ($running && $self->{colour} != COLOUR_NONE) {
		368	# during game
		369	$self->{button_undo}->show;
		370	$self->{button_resign}->show;
335		371
336	my $area = $event->area;	372	if ($self->{cur_board}{score}) {
337		373	# during scoring
338	$self->redraw ($area);	374	$self->{button_pass}->set (label => "Done", sensitive => 1, visible => 1);
339		375	$self->{board}->set (cursor => sub {
340	0;
341	}
342
343	# something Gtk2 fixed
344	sub INTERP_NEAREST (){ 'nearest' }
345	sub INTERP_TILES (){ 'tiles' }
346	sub INTERP_BILINEAR (){ 'bilinear' }
347	sub INTERP_HYPER (){ 'hyper' }
348
349	sub new_pixbuf {
350	my ($w, $h, $alpha, $fill) = @_;
351
352	my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
353	$pixbuf->fill ($fill) if defined $fill;
354
355	$pixbuf;
356	}
357
358	sub scale_pixbuf {
359	my ($src, $w, $h, $mode) = @_;
360
361	my $dst = new_pixbuf $w, $h, 1;
362
363	$src->scale(
364	$dst, 0, 0, $w, $h, 0, 0,
365	$w / $src->get_width, $h / $src->get_height,
366	$mode,
367	);
368
369	$dst;
370	}
371
372	# create a stack of stones
373	sub create_stack {
374	my ($self, $mark, $size, $rand) = @_;
375
376	my $shadow = $size * 0.05;
377
378	my $c = \$self->{stack}{$mark};
379	unless ($$c) {
380	for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
381	my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
382
383	# zeroeth the shadow
384	if ($mark & (MARK_B | MARK_W)) {	376	$_[0] & (MARK_B | MARK_W)
385	# the -0.5's are a mystery to me	377	? $_[0] ^ MARK_GRAYED
386	$::shadow_img->composite (	378	: $_[0];
387	$base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
388	$size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
389	$::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
390	);
391	}	379	});
392		380	$self->{board_click} = sub {
393	# first the big stones (handicap stones could be different)	381	if ($_[0] == 255) {
394	for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],	382	$self->{button_pass}->sensitive (0);
395	[MARK_W, $mark & MARK_MOVE ? 255 : 255],	383	$self->done;
396	[MARK_GRAY_B, 128],	384	} else {
397	[MARK_GRAY_W, 128]) {	385	$self->send (mark_dead =>
398	my ($mask, $alpha) = @$_;	386	channel => $self->{channel},
399	if ($mark & $mask) {	387	x => $_[0],
400	$stone->composite (	388	y => $_[1],
401	$base, 0, 0, $size, $size, 0, 0,	389	dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
402	$size / $stone->get_width, $size / $stone->get_height,
403	$::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
404	);	390	);
405	}	391	}
406	}	392	};
407		393
408	# then the small stones	394	} elsif ($self->{colour} == $self->{whosemove}) {
409	for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],	395	# normal move
410	[MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {	396	$self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1);
411	my ($mask, $img) = @$_;	397	$self->{board}->set (cursor => sub {
412	if ($mark & $mask) {	398	# if is_valid_move oder so#TODO#
413	$img->composite (	399	$_[0] & (MARK_B | MARK_W)
414	$base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
415	$size / $img->get_width / 2, $size / $img->get_height / 2,
416	$::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
417	);	400	? $_[0]
		401	: $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B);
418	}	402	});
		403	$self->{board_click} = sub {
		404	$self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
		405	$self->{board}->set (cursor => undef);
		406	delete $self->{board_click};
		407	$self->{button_pass}->sensitive (0);
419	}	408	};
420
421	# and lastly any markers
422	my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
423
424	for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
425	[MARK_TRIANGLE, $::triangle_img[$dark_bg]],
426	[MARK_SQUARE, $::square_img[$dark_bg]]) {
427	my ($mask, $img) = @$_;
428	if ($mark & $mask) {
429	$img->composite (
430	$base, 0, 0, $size, $size, 0, 0,
431	$size / $img->get_width, $size / $img->get_height,
432	$::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
433	);
434	}
435	}
436
437	push @$$c, $base;
438	}
439	}
440
441	$$c->[$rand % @$$c];
442	}
443
444	sub pixbuf_text {
445	my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
446
447	my @c = grep $_,
448	map $::font[$colour][$::fontmap{$_}],
449	split //, $text;
450
451	if (@c) {
452	my $spacing = $height * 0.1;
453	my $s = $height / List::Util::max map $_->get_height, @c;
454	my $W = List::Util::sum map $_->get_width, @c;
455
456	$x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
457	$y -= $height * 0.5;
458
459	for (@c) {
460	my $w = $_->get_width * $s;
461	# +2 == don't fight the rounding
462	$_->composite ($pixbuf,
463	$x, $y, $w+2, $height+2, $x, $y, $s, $s,
464	$::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
465
466	$x += $w + $spacing;
467	}
468	}
469	}
470
471	sub pixbuf_rect {
472	my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
473	# we fake lines by... a horrible method :/
474	my $colour_pb = new_pixbuf 1, 1, 0, $colour;
475	$colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
476	INTERP_NEAREST, $alpha);
477	}
478
479	sub repaint_board {
480	my ($self) = @_;
481	my $canvas = $self->{canvas};
482	my $expose_area = undef;
483
484	return $expose_area unless $self->{board};
485
486	my ($w, $h) = ($canvas->allocation->values)[2,3];
487
488	die "FATAL: board aspect ratio != 1" unless $w == $h;
489
490	my $s = $w;
491
492	return unless $s >= 200;
493
494	my $size = $self->{size};
495
496	# we leave enough space for the shadows.. I like smaller stones, and we
497	# do no need to do the nifty recursive screen updates that goban2 does
498	my $border = int ($s / ($size + 3) * 0.5);
499	my $s2 = $s - $border * 2;
500	my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
501	my $ofs = int ($edge / 2);
502
503	my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
504
505	my $pixbuf;
506
507	my $oldboard;
508
509	if ($self->{background}) {
510	if ($oldboard = $self->{board_shown}) {
511	$pixbuf = $self->{pixbuf};
512	} else {	409	} else {
513	$pixbuf = $self->{background}->copy;	410	$self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
514	$expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;	411	$self->{board}->set (cursor => undef);
515	}	412	}
516	} else {	413	} else {
517	$expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;	414	$self->{button_undo}->hide;
		415	$self->{button_resign}->hide;
		416	$self->{button_pass}->hide;
		417	$self->{board}->set (cursor => undef);
		418	#TODO# # implement coordinate-grabbing
		419	}
		420	}
518		421
519	my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);	422	sub update_timers {
		423	my ($self, $timers) = @_;
520		424
521	if ($s < $bw && $s < $bh) {	425	my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
522	$pixbuf = new_pixbuf $s, $s, 0;	426
523	$::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);	427	for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
		428	my $t = $timers->[$colour];
		429	$self->{userpanel}[$colour]->set_timer (
		430	$running && $colour == $self->{whosemove} && $t->[0],
		431	$t->[1] || $self->{rules}{time}
		432	+ ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
		433	&& $self->{rules}{interval} * $self->{rules}{count}),
		434	$t->[2] || $self->{rules}{count});
		435	}
		436	}
		437
		438	sub update_board {
		439	my ($self) = @_;
		440	return unless $self->{path};
		441
		442	$self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
		443
		444	$self->{cur_board} = new KGS::Game::Board $self->{size};
		445	$self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
		446
		447	$self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
		448	for COLOUR_WHITE, COLOUR_BLACK;
		449
		450	if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
		451	if ($self->{curnode}{move} == 0) {
		452	$self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
524	} else {	453	} else {
525	$pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;	454	$self->{whosemove} = 1 - $self->{cur_board}{last};
526	}	455	}
527		456	} else {
528	my $linew = int ($s / 40 / $size);	457	# Chinese, Aga, NZ all have manual placement
529		458	if ($self->{curnode}{move} < $self->{handicap}) {
530	# ornamental border... we have time to waste :/	459	$self->{whosemove} = COLOUR_BLACK;
531	pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;	460	} elsif ($self->{curnode}{move} == $self->{handicap}) {
532	pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;	461	$self->{whosemove} = COLOUR_WHITE;
533	pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;	462	} else {
534	pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;	463	$self->{whosemove} = 1 - $self->{cur_board}{last};
535
536	for my $i (1 .. $size) {
537	pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
538	pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
539
540	# 38 max, but we allow a bit more
541	my $label = (qw(- A B C D E F G H J K L M N O P Q R S T U V W X Y Z
542	AA BB CC DD EE FF GG HH JJ KK LL MM NN OO PP QQ RR SS TT UU VV WW XX YY ZZ))[$i];
543
544	pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
545	pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
546	pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
547	pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
548
549	$a++;
550	$a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
551	}	464	}
552
553	# hoshi points
554	my $hoshi = sub {
555	my ($x, $y) = @_;
556	my $hs = int ($edge / 4) | 1;
557	$x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
558
559	# we use the shadow mask... not perfect, but I want to finish this
560	$::shadow_img->composite ($pixbuf,
561	$x, $y, $hs + 1, $hs + 1, $x, $y,
562	$hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
563	$::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
564	};
565
566	my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
567	$hoshi->($h1, $h1);
568	$hoshi->($size - $h1 + 1, $h1);
569	$hoshi->($h1, $size - $h1 + 1);
570	$hoshi->($size - $h1 + 1, $size - $h1 + 1);
571
572	if ($size % 2) { # on odd boards, also the remaining 5
573	my $h2 = ($size + 1) / 2;
574	if ($size > 10) {
575	$hoshi->($h1, $h2);
576	$hoshi->($size - $h1 + 1, $h2);
577	$hoshi->($h2, $size - $h1 + 1);
578	$hoshi->($h2, $h1);
579	}
580	# the tengen
581	$hoshi->($h2, $h2);
582	}
583
584	unless ($::config->{conserve_memory} > 1) {
585	$self->{background} = $pixbuf;
586	$pixbuf = $pixbuf->copy;
587	}
588	}
589
590	$self->{pixbuf} = $pixbuf;
591
592	for my $x (1 .. $size) {
593	for my $y (1 .. $size) {
594	my $rand = ($x ^ $y ^ 0x5555);
595
596	my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
597
598	if ($::config->{randomize}) {
599	$dx += ($rand % 7) - 3;
600	$dy += ($rand / 3 % 7) - 3;
601	}
602
603	my $shadow = $edge * 0.05;
604	my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
605
606	my $mark = $self->{board}{board}[$x-1][$y-1];
607	my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
608
609	if ($oldboard) {
610	next if $old == $mark; # no change
611
612	$self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
613	$expose_area = $expose_area
614	? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
615	: new Gtk2::Gdk::Rectangle @$area;
616	}
617
618	if ($mark) {
619	my $pb = $self->create_stack($mark, $edge, $rand);
620
621	$pb->composite ($pixbuf, @$area,
622	$dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
623
624	# labels are handled here because they are quite rare
625	if ($mark & MARK_LABEL) {
626	my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
627
628	if ($white) {
629	pixbuf_text $pixbuf, 0,
630	$k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
631	$self->{board}{label}[$x-1][$y-1];
632	}
633	pixbuf_text $pixbuf, $white,
634	$k[$x], $k[$y], $ofs * 0.7,
635	$self->{board}{label}[$x-1][$y-1];
636	}
637	}
638	}
639	}
640
641	$self->{board_shown} = Storable::dclone $self->{board};
642	#d# save
643	#Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
644
645	$expose_area;
646	}
647
648	sub redraw {
649	my ($self, $area) = @_;
650
651	if ($area && $self->{pixbuf}) {
652	my ($x, $y, $w, $h) = $area->values;
653
654	$self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
655	$x, $y, $x, $y, $w, $h,
656	"normal", 0, 0);
657	$self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
658	$x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
659	}
660	}
661
662	sub update_board {
663	my ($self) = @_;
664	return unless $self->{path};
665
666	#$self->{update_board_cb} ||= add Glib::Idle sub {
667	my $move = int $self->{moveadj}->get_value;
668
669	my $running = $move == @{$self->{path}};
670
671	$self->{board_label}->set_text ("Move " . ($move - 1));
672
673	$self->{board} = new KGS::Game::Board $self->{size};
674	$self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
675
676	for my $colour (WHITE, BLACK) {
677	$self->{userpanel}[$colour]->set_state (
678	$self->{board}{captures}[$colour],
679	$self->{board}{timer}[$colour],
680	($running && $self->{lastmove_colour} == !$colour)
681	? $self->{lastmove_time} : 0
682	);
683	}
684
685	$self->redraw ($self->repaint_board);
686
687	# delete $self->{update_board_cb};
688	#}	465	}
		466
		467	my $start_time = $self->{rules}{time};
		468
		469	if ($self->{showmove} == @{$self->{path}}) {
		470	$self->{timers} = [
		471	[$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
		472	[$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
		473	];
		474	$self->update_timers ($self->{timers});
		475	} else {
		476	$self->update_timers ([
		477	[0, @{$self->{cur_board}{timer}[0]}],
		478	[0, @{$self->{cur_board}{timer}[1]}],
		479	]);
		480	}
		481
		482	$self->{board}->set_board ($self->{cur_board});
		483
		484	if ($self->{cur_board}{score}) {
		485	$self->{score_inlay} ||= $self->{chat}->new_inlay;
		486	$self->{score_inlay}->clear;
		487	$self->{score_inlay}->append_text ("\n<header>Scoring</header>"
		488	. "\n<score>"
		489	. "White: $self->{cur_board}{score}[COLOUR_WHITE], "
		490	. "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
		491	. "</score>");
		492	} elsif ($self->{score_inlay}) {
		493	(delete $self->{score_inlay})->clear;
		494	}
		495
		496	$self->update_cursor;
689	}	497	}
690		498
691	sub event_update_tree {	499	sub event_update_tree {
692	my ($self) = @_;	500	my ($self) = @_;
		501
		502	(delete $self->{undo_inlay})->clear
		503	if $self->{undo_inlay};
693		504
694	$self->{path} = $self->get_path;	505	$self->{path} = $self->get_path;
695		506
696	if ($self->{moveadj}) {	507	if ($self->{moveadj}) {
697	my $upper = $self->{moveadj}->upper;	508	my $upper = $self->{moveadj}->upper;
…		…
740	}sgexi;	551	}sgexi;
741		552
742	$text .= $_;	553	$text .= $_;
743	}	554	}
744		555
745	$self->{text}->append_text ($text);	556	$self->{chat}->append_text ($text);
746	}	557	}
747		558
748	sub event_join {	559	sub event_join {
749	my ($self) = @_;	560	my ($self) = @_;
		561
750	$self->SUPER::event_join;	562	$self->SUPER::event_join (@_);
		563	$self->init_tree;
		564	$self->event_update_game;
751	}	565	}
752		566
753	sub event_part {	567	sub event_part {
754	my ($self) = @_;	568	my ($self) = @_;
		569
755	$self->SUPER::event_part;	570	$self->SUPER::event_part;
756	$self->destroy;	571	$self->destroy;
757	}	572	}
758		573
759	sub event_move {	574	sub event_move {
…		…
761	sound::play 1, $pass ? "pass" : "move";	576	sound::play 1, $pass ? "pass" : "move";
762	}	577	}
763		578
764	sub event_update_game {	579	sub event_update_game {
765	my ($self) = @_;	580	my ($self) = @_;
		581
766	$self->SUPER::event_update_game;	582	$self->SUPER::event_update_game;
767		583
768	my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window";	584	return unless $self->{joined};
		585
		586	$self->{colour} = $self->player_colour ($self->{conn}{name});
		587
		588	my $title = defined $self->{channel}
		589	? $self->owner->as_string . " " . $self->opponent_string
		590	: "Game Window";
769	$self->{window}->set_title("KGS Game $title");	591	$self->set_title ("KGS Game $title");
770	$self->{title}->set_text ($title);	592	$self->{title}->set_text ($title);
771		593
772	$self->{user}[BLACK] = $self->{user1};	594	$self->{user}[COLOUR_BLACK] = $self->{black};
773	$self->{user}[WHITE] = $self->{user2};	595	$self->{user}[COLOUR_WHITE] = $self->{white};
774		596
775	# show board	597	# show board
		598	if ($self->is_inprogress) {
		599	if (!$self->{boardbox}->parent) {
		600	$self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
		601	$self->{left}->add ($self->{boardbox});
		602	$self->{board}->signal_connect (button_release => sub {
		603	if ($_[1] == 1) {
		604	$self->{board_click}->($_[2], $_[3]) if $self->{board_click};
		605	}
		606	});
		607	}
		608	if (my $ch = delete $self->{challenge}) {
		609	$_->{inlay}->destroy for values %$ch;
		610	}
		611	$self->update_cursor;
		612	}
		613
		614	$self->{left}->show_all;
		615
		616	$self->{rules_inlay}->refresh;
776		617
777	$self->{left}->remove ($_) for $self->{left}->get_children;	618	}
		619
		620	sub draw_setup {
		621	my ($self, $inlay) = @_;
		622
		623	return unless $self->{joined};
		624
		625	my $rules = $self->{rules};
		626
		627	my $text = "";
		628
		629	$text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
		630	if $self->{teacher};
		631
		632	$text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
		633	if $self->{owner}->is_valid;
		634
778	if ($self->is_valid) {	635	if ($self->is_inprogress) {
779	$self->{left}->add ($self->{boardbox});
780	(delete $self->{challenge})->destroy if $self->{challenge};
781	} else {
782	$self->{left}->add ($self->{challenge}->widget);
783	}
784	$self->{left}->show_all;
785
786	# view text
787
788	my @ga;
789	$ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
790	. " (" . (util::toxml $gameopt{$self->option}) . ")";
791	$ga[1] = "\nFlags:";
792	$ga[1] .= " valid" if $self->is_valid;
793	$ga[1] .= " adjourned" if $self->is_adjourned;
794	$ga[1] .= " scored" if $self->is_scored;
795	$ga[1] .= " saved" if $self->is_saved;
796
797	$ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
798
799	$ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"	636	$text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
800	. " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"	637	. " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
801	if $self->is_valid;
802
803	if ($self->is_valid) {
804	$ga[4] = "\nHandicap: " . $self->{handicap};
805	$ga[5] = "\nKomi: " . $self->{komi};
806	$ga[6] = "\nSize: " . $self->size_string;
807	}
808
809	if ($self->is_scored) {
810	$ga[7] = "\nResult: " . $self->score_string;
811	}
812
813	$text = "\n<infoblock><header>Game Update</header>";
814	for (0..7) {
815	if ($self->{gatext}[$_] ne $ga[$_]) {
816	$text .= $ga[$_];
817	}
818	}
819	$text .= "</infoblock>";
820
821	$self->{gatext} = \@ga;
822		638	}
823	$self->{text}->append_text ($text);	639	$text .= "\nType: " . util::toxml $gametype{$self->type};
824	}
825
826	sub event_update_rules {
827	my ($self, $rules) = @_;
828
829	$self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
830	for BLACK, WHITE;
831
832	sound::play 3, "gamestart";
833
834	my $text = "\n<header>Game Rules</header>";
835		640
836	$text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};	641	$text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
837		642
838	$text .= "\nTime: ";	643	$text .= "\nTime: ";
839		644
…		…
841	$text .= "UNLIMITED";	646	$text .= "UNLIMITED";
842	} elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {	647	} elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
843	$text .= util::format_time $rules->{time};	648	$text .= util::format_time $rules->{time};
844	$text .= " ABS";	649	$text .= " ABS";
845	} elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {	650	} elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
846	$text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};	651	$text .= util::format_time $rules->{time};
847	$text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};	652	$text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
848	} elsif ($rules->{timesys} == TIMESYS_CANADIAN) {	653	} elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
849	$text .= util::format_time $rules->{time};	654	$text .= util::format_time $rules->{time};
850	$text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};	655	$text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
851	}	656	}
852		657
		658	$text .= "\nFlags:";
		659	$text .= " private" if $self->is_private;
		660	$text .= " started" if $self->is_inprogress;
		661	$text .= " adjourned" if $self->is_adjourned;
		662	$text .= " scored" if $self->is_scored;
		663	$text .= " saved" if $self->is_saved;
		664
		665	if ($self->is_inprogress) {
		666	$text .= "\nHandicap: " . $self->{handicap};
		667	$text .= "\nKomi: " . $self->{komi};
		668	$text .= "\nSize: " . $self->size_string;
		669	}
		670
		671	if ($self->is_scored) {
		672	$text .= "\nResult: " . $self->score_string;
		673	}
		674
853	$self->{text}->append_text ("<infoblock>$text</infoblock>");	675	$inlay->append_text ("<infoblock>$text</infoblock>");
854	}
855		676
856	sub inject_resign_game {	677	}
		678
		679	sub event_update_rules {
857	my ($self, $msg) = @_;	680	my ($self, $rules) = @_;
		681
		682	$self->{rules} = $rules;
		683
		684	if ($self->{user}) {
		685	$self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
		686	for COLOUR_BLACK, COLOUR_WHITE;
		687	}
		688
		689	sound::play 3, "gamestart";
		690
		691	$self->{rules_inlay}->refresh;
		692	}
		693
		694	sub event_resign_game {
		695	my ($self, $player) = @_;
858		696
859	sound::play 3, "resign";	697	sound::play 3, "resign";
860
861	$self->{text}->append_text ("\n<infoblock><header>Resign</header>"	698	$self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
862	. "\n<user>"	699	. "\n<user>"
863	. (util::toxml $self->{user}[$msg->{player}]->as_string)	700	. (util::toxml $self->{user}[$msg->{player}]->as_string)
864	. "</user> resigned.</infoblock>");	701	. "</user> resigned.</infoblock>");
865	}	702	}
866		703
		704	sub event_out_of_time {
		705	my ($self, $player) = @_;
		706
		707	sound::play 3, "timewin";
		708	$self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
		709	. "\n<user>"
		710	. (util::toxml $self->{user}[$msg->{player}]->as_string)
		711	. "</user> ran out of time and lost.</infoblock>");
		712	}
		713
		714	sub event_done {
		715	my ($self) = @_;
		716
		717	if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
		718	$self->{chat}->append_text ("\n<infoblock><header>Done</header>"
		719	. "\nYour opponent pressed done.");
		720	}
		721	}
		722
867	sub inject_final_result {	723	sub inject_final_result {
868	my ($self, $msg) = @_;	724	my ($self, $msg) = @_;
869		725
870	$self->{text}->append_text ("<infoblock>\n<header>Game Over</header>"	726	$self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
871	. "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)	727	. "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
872	. "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)	728	. "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
873	. "</infoblock>"	729	. "</infoblock>"
874	);	730	);
875	}	731	}
876		732
877	sub destroy {	733	sub inject_set_gametime {
		734	my ($self, $msg) = @_;
		735
		736	$self->{timers} = [
		737	[$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
		738	[$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
		739	];
		740
		741	$self->update_timers ($self->{timers})
		742	if $self->{showmove} == @{$self->{path}};
		743	}
		744
		745	sub inject_req_undo {
		746	my ($self, $msg) = @_;
		747
		748	my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
		749	return if $inlay->{ignore};
		750
		751	sound::play 3, "warning" unless $inlay->{count};
		752	$inlay->{count}++;
		753
		754	$inlay->clear;
		755	$inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
		756	$inlay->append_button ("Grant", sub {
		757	(delete $self->{undo_inlay})->clear;
		758	$self->send (grant_undo => channel => $self->{channel});
		759	});
		760	$inlay->append_button ("Ignore", sub {
		761	$inlay->clear;
		762	$inlay->{ignore} = 1;
		763	# but leave inlay, so further undo requests get counted
		764	});
		765
		766	$self->{chat}->set_end;
		767	}
		768
		769	sub inject_new_game {
		770	my ($self, $msg) = @_;
		771
		772	$self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>");
		773	delete $self->{cid};
		774	}
		775
		776	sub draw_challenge {
878	my ($self) = @_;	777	my ($self, $id) = @_;
879	$self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy	778
880	for BLACK, WHITE;	779	my $info = $self->{challenge}{$id};
881	$self->SUPER::destroy;	780	my $inlay = $info->{inlay};
882	delete $appwin::gamelist->{game}{$self->{channel}};	781	my $rules = $info->{rules};
		782
		783	my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
		784	my $opponent = $as_black ? $info->{white} : $info->{black};
		785
		786	my ($size, $time, $interval, $count, $type);
		787
		788	if (!$self->{channel}) {
		789	$inlay->append_text ("\nNotes: ");
		790	$inlay->append_entry (\$info->{notes}, 20, "");
		791	$inlay->append_text ("\nGlobal Offer: ");
		792	$inlay->append_optionmenu (\$info->{flags},
		793	0 => "No",
		794	2 => "Yes",
		795	);
		796	} else {
		797	$inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
		798	}
		799
		800	$inlay->append_text ("\nType: ");
		801	$type = $inlay->append_optionmenu (
		802	\$info->{gametype},
		803	GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
		804	GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
		805	GAMETYPE_TEACHING , "Teaching (not yet)",
		806	GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
		807	GAMETYPE_SIMUL , "Simul (not yet!)",
		808	GAMETYPE_FREE , "Free",
		809	GAMETYPE_RATED , "Rated",
		810	sub {
		811	$size->set_history (2) if $_[0] eq GAMETYPE_RATED;
		812	},
		813	);
		814
		815	if ($self->{channel}) {
		816	$inlay->append_text ("\nMy Colour: ");
		817	$inlay->append_optionmenu (
		818	\$as_black,
		819	0 => "White",
		820	1 => "Black",
		821	sub {
		822	if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
		823	($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
		824	}
		825	}
		826	);
		827	}
		828
		829	$inlay->append_text ("\nRuleset: ");
		830	$inlay->append_optionmenu (
		831	\$info->{rules}{ruleset},
		832	RULESET_JAPANESE , "Japanese",
		833	RULESET_CHINESE , "Chinese",
		834	RULESET_AGA , "AGA",
		835	RULESET_NEW_ZEALAND, "New Zealand",
		836	);
		837
		838	$inlay->append_text ("\nSize: ");
		839	$size = $inlay->append_optionmenu (
		840	\$info->{rules}{size},
		841	(9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38),
		842	sub {
		843	$type->set_history (5) # reset to free
		844	if $_[0] != 19 && $info->{gametype} == GAMETYPE_RATED;
		845	},
		846	);
		847
		848	if ($self->{channel}) {
		849	$inlay->append_text ("\nHandicap: ");
		850	$inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
		851
		852	$inlay->append_text ("\nKomi: ");
		853	$inlay->append_entry (\$info->{rules}{komi}, 5);
		854	}
		855
		856	$inlay->append_text ("\nTimesys: ");
		857	$inlay->append_optionmenu (
		858	\$info->{rules}{timesys},
		859	&TIMESYS_NONE => "None",
		860	&TIMESYS_ABSOLUTE => "Absolute",
		861	&TIMESYS_BYO_YOMI => "Byo Yomi",
		862	&TIMESYS_CANADIAN => "Canadian",
		863	sub {
		864	my ($new) = @_;
		865
		866	if ($new eq TIMESYS_NONE) {
		867	$time->hide;
		868	$interval->hide;
		869	$count->hide;
		870	} else {
		871	$time->show;
		872	$time->set_text ($self->{app}{defaults}{time});
		873	if ($new eq TIMESYS_ABSOLUTE) {
		874	$interval->hide;
		875	$count->hide;
		876	} else {
		877	$interval->show;
		878	$count->show;
		879	if ($new eq TIMESYS_BYO_YOMI) {
		880	$interval->set_text ($self->{app}{defaults}{byo_time});
		881	$count->set_text ($self->{app}{defaults}{byo_period});
		882	} elsif ($new eq TIMESYS_CANADIAN) {
		883	$interval->set_text ($self->{app}{defaults}{can_time});
		884	$count->set_text ($self->{app}{defaults}{can_period});
		885	}
		886	}
		887	}
		888	}
		889	);
		890
		891	$inlay->append_text ("\nMain Time: ");
		892	$time = $inlay->append_entry (\$info->{rules}{time}, 5);
		893	$inlay->append_text ("\nInterval: ");
		894	$interval = $inlay->append_entry (\$info->{rules}{interval}, 3);
		895	$inlay->append_text ("\nPeriods/Stones: ");
		896	$count = $inlay->append_entry (\$info->{rules}{count}, 2);
		897
		898	$inlay->append_text ("\n");
		899
		900	if (!$self->{channel}) {
		901	$inlay->append_button ("Create Challenge", sub {
		902	$inlay->clear;
		903	$self->{cid} = $self->{conn}->alloc_clientid;
		904	$self->send (new_game =>
		905	channel => delete $self->{roomid},
		906	gametype => $info->{gametype},
		907	cid => $self->{cid},
		908	flags => $info->{flags},
		909	rules => $info->{rules},
		910	notes => $info->{notes},
		911	);
		912	});
		913	} else {
		914	$inlay->append_button ("OK", sub {
		915	$inlay->clear;
		916	$self->send (challenge =>
		917	channel => $self->{channel},
		918	black => $info->{black},
		919	white => $info->{white},
		920	gametype => $info->{gametype},
		921	cid => $info->{cid},
		922	rules => $info->{rules},
		923	);
		924	});
		925	if (exists $self->{challenge}{""}) {
		926	$inlay->append_button ("Reject", sub {
		927	$inlay->clear;
		928	$self->send (reject_challenge =>
		929	channel => $self->{channel},
		930	name => $opponent->{name},
		931	gametype => $info->{gametype},
		932	cid => $info->{cid},
		933	rules => $info->{rules},
		934	);
		935	});
		936	}
		937	}
		938	}
		939
		940	sub draw_users {
		941	my ($self, $inlay) = @_;
		942
		943	for (sort keys %{$self->{users}}) {
		944	$inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
		945	}
		946	}
		947
		948	sub event_challenge {
		949	my ($self, $info) = @_;
		950
		951	my $as_black = $info->{black}->{name} eq $self->{conn}{name};
		952	my $opponent = $as_black ? $info->{white} : $info->{black};
		953
		954	my $id = $opponent->{name};
		955
		956	$self->{challenge}{$id} = $info;
		957	$self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
		958	exists $self->{challenge}{""}
		959	? "Challenge from $opponent->{name}"
		960	: "Challenge to $opponent->{name}",
		961	sub {
		962	$self->{challenge}{$id}{inlay} = $_[0];
		963	$self->draw_challenge ($id);
		964	},
		965	!exists $self->{challenge}{""} # only open when not offerer
		966	);
883	}	967	}
884		968
885	1;	969	1;
886		970

Diff Legend

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