[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.315 by root, Mon Jul 23 17:53:55 2007 UTC

…		…
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
24		24
		25	use JSON::XS 1.4 ();
25	use BDB ();	26	use BDB ();
26	use Data::Dumper;	27	use Data::Dumper;
27	use Digest::MD5;	28	use Digest::MD5;
28	use Fcntl;	29	use Fcntl;
29	use YAML::Syck ();	30	use YAML::Syck ();
30	use IO::AIO 2.32 ();	31	use IO::AIO 2.32 ();
31	use Time::HiRes;	32	use Time::HiRes;
32	use Compress::LZF;	33	use Compress::LZF;
		34	use Digest::MD5 ();
33		35
34	# configure various modules to our taste	36	# configure various modules to our taste
35	#	37	#
36	$Storable::canonical = 1; # reduce rsync transfers	38	$Storable::canonical = 1; # reduce rsync transfers
37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
49	our %COMMAND = ();	51	our %COMMAND = ();
50	our %COMMAND_TIME = ();	52	our %COMMAND_TIME = ();
51		53
52	our @EXTS = (); # list of extension package names	54	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	55	our %EXTCMD = ();
		56	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	57	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	58	our %EXT_MAP = (); # pluggable maps
56		59
57	our $RELOAD; # number of reloads so far	60	our $RELOAD; # number of reloads so far
58	our @EVENT;	61	our @EVENT;
…		…
163	=item cf::wait_for_tick, cf::wait_for_tick_begin	166	=item cf::wait_for_tick, cf::wait_for_tick_begin
164		167
165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166	returns directly I<after> the tick processing (and consequently, can only wake one process	169	returns directly I<after> the tick processing (and consequently, can only wake one process
167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		171
		172	=item @cf::INVOKE_RESULTS
		173
		174	This array contains the results of the last C<invoke ()> call. When
		175	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		176	that call.
168		177
169	=back	178	=back
170		179
171	=cut	180	=cut
172		181
…		…
236	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	246	$d
238	} \|\| "[unable to dump $_[0]: '$@']";	247	} \|\| "[unable to dump $_[0]: '$@']";
239	}	248	}
240		249
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	250	=item $ref = cf::from_json $json
244		251
245	Converts a JSON string into the corresponding perl data structure.	252	Converts a JSON string into the corresponding perl data structure.
246		253
247	=item $json = cf::to_json $ref	254	=item $json = cf::to_json $ref
248		255
249	Converts a perl data structure into its JSON representation.	256	Converts a perl data structure into its JSON representation.
		257
		258	=cut
		259
		260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		261
		262	sub to_json ($) { $json_coder->encode ($_[0]) }
		263	sub from_json ($) { $json_coder->decode ($_[0]) }
250		264
251	=item cf::lock_wait $string	265	=item cf::lock_wait $string
252		266
253	Wait until the given lock is available. See cf::lock_acquire.	267	Wait until the given lock is available. See cf::lock_acquire.
254		268
…		…
306	my $guard = Coro::guard {	320	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	321	$TICK_WATCHER->start;
308	};	322	};
309	$TICK_WATCHER->stop;	323	$TICK_WATCHER->stop;
310	$guard	324	$guard
		325	}
		326
		327	=item cf::get_slot $time[, $priority[, $name]]
		328
		329	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		330	This call blocks and returns only when you have at least C<$time> seconds
		331	of cpu time till the next tick. The slot is only valid till the next cede.
		332
		333	The optional C<$name> can be used to identify the job to run. It might be
		334	used for statistical purposes and should identify the same time-class.
		335
		336	Useful for short background jobs.
		337
		338	=cut
		339
		340	our @SLOT_QUEUE;
		341	our $SLOT_QUEUE;
		342
		343	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		344	$SLOT_QUEUE = Coro::async {
		345	my $signal = new Coro::Signal;
		346
		347	while () {
		348	next_job:
		349	my $avail = cf::till_tick;
		350	if ($avail > 0.01) {
		351	for (0 .. $#SLOT_QUEUE) {
		352	if ($SLOT_QUEUE[$_][0] < $avail) {
		353	my $job = splice @SLOT_QUEUE, $_, 1, ();
		354	$job->[2]->send;
		355	Coro::cede;
		356	goto next_job;
		357	}
		358	}
		359	}
		360
		361	if (@SLOT_QUEUE) {
		362	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		363	push @cf::WAIT_FOR_TICK, $signal;
		364	$signal->wait;
		365	} else {
		366	Coro::schedule;
		367	}
		368	}
		369	};
		370
		371	sub get_slot($;$$) {
		372	my ($time, $pri, $name) = @_;
		373
		374	$time = $TICK * .6 if $time > $TICK * .6;
		375	my $sig = new Coro::Signal;
		376
		377	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		378	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		379	$SLOT_QUEUE->ready;
		380	$sig->wait;
311	}	381	}
312		382
313	=item cf::async { BLOCK }	383	=item cf::async { BLOCK }
314		384
315	Currently the same as Coro::async_pool, meaning you cannot use	385	Currently the same as Coro::async_pool, meaning you cannot use
…		…
402	Coro::Storable. May, of course, block. Note that the executed sub may	472	Coro::Storable. May, of course, block. Note that the executed sub may
403	never block itself or use any form of Event handling.	473	never block itself or use any form of Event handling.
404		474
405	=cut	475	=cut
406		476
		477	sub _store_scalar {
		478	open my $fh, ">", \my $buf
		479	or die "fork_call: cannot open fh-to-buf in child : $!";
		480	Storable::store_fd $_[0], $fh;
		481	close $fh;
		482
		483	$buf
		484	}
		485
407	sub fork_call(&@) {	486	sub fork_call(&@) {
408	my ($cb, @args) = @_;	487	my ($cb, @args) = @_;
409		488
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	489	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411	# or die "socketpair: $!";	490	# or die "socketpair: $!";
…		…
414		493
415	if (my $pid = fork) {	494	if (my $pid = fork) {
416	close $fh2;	495	close $fh2;
417		496
418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);	497	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		498	warn "pst<$res>" unless $res =~ /^pst/;
419	$res = Coro::Storable::thaw $res;	499	$res = Coro::Storable::thaw $res;
420		500
421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave	501	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422		502
423	die $$res unless "ARRAY" eq ref $res;	503	Carp::confess $$res unless "ARRAY" eq ref $res;
424		504
425	return wantarray ? @$res : $res->[-1];	505	return wantarray ? @$res : $res->[-1];
426	} else {	506	} else {
427	reset_signals;	507	reset_signals;
428	local $SIG{__WARN__};	508	local $SIG{__WARN__};
429	local $SIG{__DIE__};	509	local $SIG{__DIE__};
		510	# just in case, this hack effectively disables event
		511	# in the child. cleaner and slower would be canceling all watchers,
		512	# but this works for the time being.
		513	local $Coro::idle;
		514	$Coro::current->prio (Coro::PRIO_MAX);
		515
430	eval {	516	eval {
431	close $fh1;	517	close $fh1;
432		518
433	my @res = eval { $cb->(@args) };	519	my @res = eval { $cb->(@args) };
		520
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);	521	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
		522	close $fh2;
435	};	523	};
436		524
437	warn $@ if $@;	525	warn $@ if $@;
438	_exit 0;	526	_exit 0;
439	}	527	}
…		…
840	";	928	";
841	die if $@;	929	die if $@;
842	}	930	}
843		931
844	our $override;	932	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	933	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		934
847	sub override {	935	sub override {
848	$override = 1;	936	$override = 1;
849	@invoke_results = ();	937	@INVOKE_RESULTS = (@_);
850	}	938	}
851		939
852	sub do_invoke {	940	sub do_invoke {
853	my $event = shift;	941	my $event = shift;
854	my $callbacks = shift;	942	my $callbacks = shift;
855		943
856	@invoke_results = ();	944	@INVOKE_RESULTS = ();
857		945
858	local $override;	946	local $override;
859		947
860	for (@$callbacks) {	948	for (@$callbacks) {
861	eval { &{$_->[1]} };	949	eval { &{$_->[1]} };
…		…
878		966
879	Generate an object-specific event with the given arguments.	967	Generate an object-specific event with the given arguments.
880		968
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	969	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882	removed in future versions), and there is no public API to access override	970	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	971	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		972
885	=back	973	=back
886		974
887	=cut	975	=cut
888		976
889	#############################################################################	977	#############################################################################
890	# object support	978	# object support
		979	#
		980
		981	sub _can_merge {
		982	my ($ob1, $ob2) = @_;
		983
		984	local $Storable::canonical = 1;
		985	my $fob1 = Storable::freeze $ob1;
		986	my $fob2 = Storable::freeze $ob2;
		987
		988	$fob1 eq $fob2
		989	}
891		990
892	sub reattach {	991	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	992	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	993	my ($obj) = @_;
895		994
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1128	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1129	}
1031		1130
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1131	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1132
1034	Register a callback fro execution when the client sends an extcmd packet.	1133	Register a callback for execution when the client sends an (synchronous)
		1134	extcmd packet. Ext commands will be processed in the order they are
		1135	received by the server, like other user commands. The first argument is
		1136	the logged-in player. Ext commands can only be processed after a player
		1137	has logged in successfully.
1035		1138
1036	If the callback returns something, it is sent back as if reply was being	1139	If the callback returns something, it is sent back as if reply was being
1037	called.	1140	called.
1038		1141
		1142	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1143
		1144	Register a callback for execution when the client sends an (asynchronous)
		1145	exticmd packet. Exti commands are processed by the server as soon as they
		1146	are received, i.e. out of order w.r.t. other commands. The first argument
		1147	is a client socket. Exti commands can be received anytime, even before
		1148	log-in.
		1149
		1150	If the callback returns something, it is sent back as if reply was being
		1151	called.
		1152
1039	=cut	1153	=cut
1040		1154
1041	sub register_extcmd {	1155	sub register_extcmd {
1042	my ($name, $cb) = @_;	1156	my ($name, $cb) = @_;
1043		1157
1044	$EXTCMD{$name} = $cb;	1158	$EXTCMD{$name} = $cb;
		1159	}
		1160
		1161	sub register_exticmd {
		1162	my ($name, $cb) = @_;
		1163
		1164	$EXTICMD{$name} = $cb;
1045	}	1165	}
1046		1166
1047	cf::player->attach (	1167	cf::player->attach (
1048	on_command => sub {	1168	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1169	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1178	cf::override;
1059	},	1179	},
1060	on_extcmd => sub {	1180	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1181	my ($pl, $buf) = @_;
1062		1182
1063	my $msg = eval { from_json $buf };	1183	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1184
1065	if (ref $msg) {	1185	if (ref $msg) {
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1186	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1187	if (my %reply = $cb->($pl, $msg)) {
1068	$pl->ext_reply ($msg->{msgid}, %reply);	1188	$pl->ext_reply ($msg->{msgid}, %reply);
…		…
1347	}	1467	}
1348		1468
1349	\@paths	1469	\@paths
1350	}	1470	}
1351		1471
		1472	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1473
		1474	Expand crossfire pod fragments into protocol xml.
		1475
		1476	=cut
		1477
		1478	sub expand_cfpod {
		1479	((my $self), (local $_)) = @_;
		1480
		1481	# escape & and <
		1482	s/&/&/g;
		1483	s/(?<![BIUGH])</</g;
		1484
		1485	# this is buggy, it needs to properly take care of nested <'s
		1486
		1487	1 while
		1488	# replace B<>, I<>, U<> etc.
		1489	s/B<([^\>]*)>/<b>$1<\/b>/
		1490	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
		1491	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1492	# replace G<male\|female> tags
		1493	\|\| s{G<([^>\|])\\|([^>])>}{
		1494	$self->gender ? $2 : $1
		1495	}ge
		1496	# replace H<hint text>
		1497	\|\| s{H<([^\>]*)>}
		1498	{
		1499	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1500	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1501	"")
		1502	[$self->{hintmode}]
		1503	}ge;
		1504
		1505	# create single paragraphs (very hackish)
		1506	s/(?<=\S)\n(?=\w)/ /g;
		1507
		1508	# compress some whitespace
		1509	s/\s+\n/\n/g; # ws line-ends
		1510	s/\n\n+/\n/g; # double lines
		1511	s/^\n+//; # beginning lines
		1512	s/\n+$//; # ending lines
		1513
		1514	$_
		1515	}
		1516
		1517	sub hintmode {
		1518	$_[0]{hintmode} = $_[1] if @_ > 1;
		1519	$_[0]{hintmode}
		1520	}
		1521
1352	=item $player->ext_reply ($msgid, %msg)	1522	=item $player->ext_reply ($msgid, %msg)
1353		1523
1354	Sends an ext reply to the player.	1524	Sends an ext reply to the player.
1355		1525
1356	=cut	1526	=cut
1357		1527
1358	sub ext_reply($$%) {	1528	sub ext_reply($$%) {
1359	my ($self, $id, %msg) = @_;	1529	my ($self, $id, %msg) = @_;
1360		1530
1361	$msg{msgid} = $id;	1531	$msg{msgid} = $id;
1362		1532	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1533	}
1365		1534
1366	=item $player->ext_event ($type, %msg)	1535	=item $player->ext_event ($type, %msg)
1367		1536
1368	Sends an ext event to the client.	1537	Sends an ext event to the client.
…		…
1393	my ($path) = @_;	1562	my ($path) = @_;
1394		1563
1395	my ($match, $specificity);	1564	my ($match, $specificity);
1396		1565
1397	for my $region (list) {	1566	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1567	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1568	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1569	if $region->specificity > $specificity;
1401	}	1570	}
1402	}	1571	}
1403		1572
…		…
1523	$self->init; # pass $1 etc.	1692	$self->init; # pass $1 etc.
1524	return $self;	1693	return $self;
1525	}	1694	}
1526	}	1695	}
1527		1696
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1697	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1698	()
1530	}	1699	}
1531		1700
1532	sub init {	1701	sub init {
1533	my ($self) = @_;	1702	my ($self) = @_;
…		…
1811		1980
1812	undef $MAP_PREFETCH{$path};	1981	undef $MAP_PREFETCH{$path};
1813	$MAP_PREFETCHER \|\|= cf::async {	1982	$MAP_PREFETCHER \|\|= cf::async {
1814	while (%MAP_PREFETCH) {	1983	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	1984	for my $path (keys %MAP_PREFETCH) {
1816	my $map = find $path	1985	if (my $map = find $path) {
1817	or next;
1818	$map->load;	1986	$map->load;
		1987	}
1819		1988
1820	delete $MAP_PREFETCH{$path};	1989	delete $MAP_PREFETCH{$path};
1821	}	1990	}
1822	}	1991	}
1823	undef $MAP_PREFETCHER;	1992	undef $MAP_PREFETCHER;
…		…
2045		2214
2046	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;	2215	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;
2047		2216
2048	if ($self->{record_replies}) {	2217	if ($self->{record_replies}) {
2049	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2218	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2219
2050	} else {	2220	} else {
		2221	my $pl = $self->contr;
		2222
		2223	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2224	my $diag = $pl->{npc_dialog};
		2225	$diag->{pl}->ext_reply (
		2226	$diag->{id},
		2227	msgtype => "reply",
		2228	msg => $diag->{pl}->expand_cfpod ($msg),
		2229	add_topics => []
		2230	);
		2231
		2232	} else {
2051	$msg = $npc->name . " says: $msg" if $npc;	2233	$msg = $npc->name . " says: $msg" if $npc;
2052	$self->message ($msg, $flags);	2234	$self->message ($msg, $flags);
		2235	}
2053	}	2236	}
2054	}	2237	}
2055		2238
2056	=item $player_object->may ("access")	2239	=item $player_object->may ("access")
2057		2240
…		…
2146		2329
2147	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2330	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148	$self->enter_map ($map, $x, $y);	2331	$self->enter_map ($map, $x, $y);
2149	}	2332	}
2150		2333
2151	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2334	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152		2335
2153	Moves the player to the given map-path and coordinates by first freezing	2336	Moves the player to the given map-path and coordinates by first freezing
2154	her, loading and preparing them map, calling the provided $check callback	2337	her, loading and preparing them map, calling the provided $check callback
2155	that has to return the map if sucecssful, and then unfreezes the player on	2338	that has to return the map if sucecssful, and then unfreezes the player on
2156	the new (success) or old (failed) map position.	2339	the new (success) or old (failed) map position. In either case, $done will
		2340	be called at the end of this process.
2157		2341
2158	=cut	2342	=cut
2159		2343
2160	our $GOTOGEN;	2344	our $GOTOGEN;
2161		2345
2162	sub cf::object::player::goto {	2346	sub cf::object::player::goto {
2163	my ($self, $path, $x, $y, $check) = @_;	2347	my ($self, $path, $x, $y, $check, $done) = @_;
2164		2348
2165	# do generation counting so two concurrent goto's will be executed in-order	2349	# do generation counting so two concurrent goto's will be executed in-order
2166	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2350	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167		2351
2168	$self->enter_link;	2352	$self->enter_link;
…		…
2188		2372
2189	if ($gen == $self->{_goto_generation}) {	2373	if ($gen == $self->{_goto_generation}) {
2190	delete $self->{_goto_generation};	2374	delete $self->{_goto_generation};
2191	$self->leave_link ($map, $x, $y);	2375	$self->leave_link ($map, $x, $y);
2192	}	2376	}
		2377
		2378	$done->() if $done;
2193	})->prio (1);	2379	})->prio (1);
2194	}	2380	}
2195		2381
2196	=item $player_object->enter_exit ($exit_object)	2382	=item $player_object->enter_exit ($exit_object)
2197		2383
…		…
2266	my $hp = $exit->stats->hp;	2452	my $hp = $exit->stats->hp;
2267	my $sp = $exit->stats->sp;	2453	my $sp = $exit->stats->sp;
2268		2454
2269	$self->enter_link;	2455	$self->enter_link;
2270		2456
		2457	# if exit is damned, update players death & WoR home-position
		2458	$self->contr->savebed ($slaying, $hp, $sp)
		2459	if $exit->flag (FLAG_DAMNED);
		2460
2271	(async {	2461	(async {
2272	$self->deactivate_recursive; # just to be sure	2462	$self->deactivate_recursive; # just to be sure
2273	unless (eval {	2463	unless (eval {
2274	$self->goto ($slaying, $hp, $sp);	2464	$self->goto ($slaying, $hp, $sp);
2275		2465
…		…
2302		2492
2303	utf8::encode $text;	2493	utf8::encode $text;
2304	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2494	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2305	}	2495	}
2306		2496
		2497	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2498
		2499	Send a drawinfo or msg packet to the client, formatting the msg for the
		2500	client if neccessary. C<$type> should be a string identifying the type of
		2501	the message, with C<log> being the default. If C<$color> is negative, suppress
		2502	the message unless the client supports the msg packet.
		2503
		2504	=cut
		2505
		2506	sub cf::client::send_msg {
		2507	my ($self, $channel, $msg, $color, @extra) = @_;
		2508
		2509	$msg = $self->pl->expand_cfpod ($msg);
		2510
		2511	$color &= ~cf::NDI_UNIQUE; # just in case...
		2512
		2513	if (ref $channel) {
		2514	# send meta info to client, if not yet sent
		2515	unless (exists $self->{channel}{$channel->{id}}) {
		2516	$self->{channel}{$channel->{id}} = $channel;
		2517	$self->ext_event (channel_info => %$channel);
		2518	}
		2519
		2520	$channel = $channel->{id};
		2521	}
		2522
		2523	return unless @extra \|\| length $msg;
		2524
		2525	if ($self->can_msg) {
		2526	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
		2527	} else {
		2528	# replace some tags by gcfclient-compatible ones
		2529	for ($msg) {
		2530	1 while
		2531	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2532	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2533	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2534	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2535	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2536	}
		2537
		2538	if ($color >= 0) {
		2539	if (0 && $msg =~ /\[/) {
		2540	$self->send_packet ("drawextinfo $color 4 0 $msg")
		2541	} else {
		2542	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
		2543	$self->send_packet ("drawinfo $color $msg")
		2544	}
		2545	}
		2546	}
		2547	}
		2548
2307	=item $client->ext_event ($type, %msg)	2549	=item $client->ext_event ($type, %msg)
2308		2550
2309	Sends an exti event to the client.	2551	Sends an ext event to the client.
2310		2552
2311	=cut	2553	=cut
2312		2554
2313	sub cf::client::ext_event($$%) {	2555	sub cf::client::ext_event($$%) {
2314	my ($self, $type, %msg) = @_;	2556	my ($self, $type, %msg) = @_;
2315		2557
		2558	return unless $self->extcmd;
		2559
2316	$msg{msgtype} = "event_$type";	2560	$msg{msgtype} = "event_$type";
2317	$self->send_packet ("ext " . cf::to_json \%msg);	2561	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2318	}	2562	}
2319		2563
2320	=item $success = $client->query ($flags, "text", \&cb)	2564	=item $success = $client->query ($flags, "text", \&cb)
2321		2565
2322	Queues a query to the client, calling the given callback with	2566	Queues a query to the client, calling the given callback with
2323	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2567	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2568	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325		2569
2326	Queries can fail, so check the return code. Or don't, as queries will become	2570	Queries can fail, so check the return code. Or don't, as queries will
2327	reliable at some point in the future.	2571	become reliable at some point in the future.
2328		2572
2329	=cut	2573	=cut
2330		2574
2331	sub cf::client::query {	2575	sub cf::client::query {
2332	my ($self, $flags, $text, $cb) = @_;	2576	my ($self, $flags, $text, $cb) = @_;
…		…
2340	utf8::encode $text;	2584	utf8::encode $text;
2341	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2585	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342		2586
2343	$self->send_packet ($self->{query_queue}[0][0])	2587	$self->send_packet ($self->{query_queue}[0][0])
2344	if @{ $self->{query_queue} } == 1;	2588	if @{ $self->{query_queue} } == 1;
		2589
		2590	1
2345	}	2591	}
2346		2592
2347	cf::client->attach (	2593	cf::client->attach (
		2594	on_connect => sub {
		2595	my ($ns) = @_;
		2596
		2597	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2598	},
2348	on_reply => sub {	2599	on_reply => sub {
2349	my ($ns, $msg) = @_;	2600	my ($ns, $msg) = @_;
2350		2601
2351	# this weird shuffling is so that direct followup queries	2602	# this weird shuffling is so that direct followup queries
2352	# get handled first	2603	# get handled first
…		…
2364	} else {	2615	} else {
2365	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2616	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366	}	2617	}
2367	}	2618	}
2368	},	2619	},
		2620	on_exticmd => sub {
		2621	my ($ns, $buf) = @_;
		2622
		2623	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2624
		2625	if (ref $msg) {
		2626	if (my $cb = $EXTICMD{$msg->{msgtype}}) {
		2627	if (my %reply = $cb->($ns, $msg)) {
		2628	$reply{msgid} = $msg->{msgid};
		2629	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
		2630	}
		2631	}
		2632	} else {
		2633	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2634	}
		2635
		2636	cf::override;
		2637	},
2369	);	2638	);
2370		2639
2371	=item $client->async (\&cb)	2640	=item $client->async (\&cb)
2372		2641
2373	Create a new coroutine, running the specified callback. The coroutine will	2642	Create a new coroutine, running the specified callback. The coroutine will
…		…
2422		2691
2423	=pod	2692	=pod
2424		2693
2425	The following functions and methods are available within a safe environment:	2694	The following functions and methods are available within a safe environment:
2426		2695
2427	cf::object contr pay_amount pay_player map	2696	cf::object
		2697	contr pay_amount pay_player map x y force_find force_add
		2698	insert remove
		2699
2428	cf::object::player player	2700	cf::object::player
2429	cf::player peaceful	2701	player
2430	cf::map trigger	2702
		2703	cf::player
		2704	peaceful
		2705
		2706	cf::map
		2707	trigger
2431		2708
2432	=cut	2709	=cut
2433		2710
2434	for (	2711	for (
2435	["cf::object" => qw(contr pay_amount pay_player map)],	2712	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2713	insert remove)],
2436	["cf::object::player" => qw(player)],	2714	["cf::object::player" => qw(player)],
2437	["cf::player" => qw(peaceful)],	2715	["cf::player" => qw(peaceful)],
2438	["cf::map" => qw(trigger)],	2716	["cf::map" => qw(trigger)],
2439	) {	2717	) {
2440	no strict 'refs';	2718	no strict 'refs';
…		…
2532	{	2810	{
2533	my $faces = $facedata->{faceinfo};	2811	my $faces = $facedata->{faceinfo};
2534		2812
2535	while (my ($face, $info) = each %$faces) {	2813	while (my ($face, $info) = each %$faces) {
2536	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2814	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2537	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2815	cf::face::set_visibility $idx, $info->{visibility};
		2816	cf::face::set_magicmap $idx, $info->{magicmap};
2538	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2817	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2539	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2818	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2540	Coro::cede;	2819
		2820	cf::cede_to_tick;
2541	}	2821	}
2542		2822
2543	while (my ($face, $info) = each %$faces) {	2823	while (my ($face, $info) = each %$faces) {
2544	next unless $info->{smooth};	2824	next unless $info->{smooth};
2545	my $idx = cf::face::find $face	2825	my $idx = cf::face::find $face
2546	or next;	2826	or next;
2547	if (my $smooth = cf::face::find $info->{smooth}) {	2827	if (my $smooth = cf::face::find $info->{smooth}) {
		2828	cf::face::set_smooth $idx, $smooth;
2548	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2829	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549	} else {	2830	} else {
2550	warn "smooth face '$info->{smooth}' not found for face '$face'";	2831	warn "smooth face '$info->{smooth}' not found for face '$face'";
2551	}	2832	}
2552	Coro::cede;	2833
		2834	cf::cede_to_tick;
2553	}	2835	}
2554	}	2836	}
2555		2837
2556	{	2838	{
2557	my $anims = $facedata->{animinfo};	2839	my $anims = $facedata->{animinfo};
2558		2840
2559	while (my ($anim, $info) = each %$anims) {	2841	while (my ($anim, $info) = each %$anims) {
2560	cf::anim::set $anim, $info->{frames}, $info->{facings};	2842	cf::anim::set $anim, $info->{frames}, $info->{facings};
2561	Coro::cede;	2843	cf::cede_to_tick;
2562	}	2844	}
2563		2845
2564	cf::anim::invalidate_all; # d'oh	2846	cf::anim::invalidate_all; # d'oh
		2847	}
		2848
		2849	{
		2850	# TODO: for gcfclient pleasure, we should give resources
		2851	# that gcfclient doesn't grok a >10000 face index.
		2852	my $res = $facedata->{resource};
		2853	my $enc = JSON::XS->new->utf8->canonical;
		2854
		2855	while (my ($name, $info) = each %$res) {
		2856	my $meta = $enc->encode ({
		2857	name => $name,
		2858	type => $info->{type},
		2859	copyright => $info->{copyright}, #TODO#
		2860	});
		2861
		2862	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		2863
		2864	if ($name =~ /\.jpg$/) {
		2865	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
		2866	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
		2867	} else {
		2868	my $data = pack "(w/a)", $meta, $info->{data};
		2869	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2870
		2871	cf::face::set_type $idx, 1;
		2872	cf::face::set_data $idx, 0, $data, $chk;
		2873	}
		2874
		2875	cf::cede_to_tick;
		2876	}
2565	}	2877	}
2566		2878
2567	1	2879	1
2568	}	2880	}
2569		2881
2570	sub reload_regions {	2882	sub reload_regions {
2571	load_resource_file "$MAPDIR/regions"	2883	load_resource_file "$MAPDIR/regions"
2572	or die "unable to load regions file\n";	2884	or die "unable to load regions file\n";
		2885
		2886	for (cf::region::list) {
		2887	$_->{match} = qr/$_->{match}/
		2888	if exists $_->{match};
		2889	}
2573	}	2890	}
2574		2891
2575	sub reload_facedata {	2892	sub reload_facedata {
2576	load_facedata "$DATADIR/facedata"	2893	load_facedata "$DATADIR/facedata"
2577	or die "unable to load facedata\n";	2894	or die "unable to load facedata\n";
2578	}	2895	}
2579		2896
2580	sub reload_archetypes {	2897	sub reload_archetypes {
		2898	load_resource_file "$DATADIR/archetypes"
		2899	or die "unable to load archetypes\n";
		2900	#d# NEED to laod twice to resolve forward references
		2901	# this really needs to be done in an extra post-pass
		2902	# (which needs to be synchronous, so solve it differently)
2581	load_resource_file "$DATADIR/archetypes"	2903	load_resource_file "$DATADIR/archetypes"
2582	or die "unable to load archetypes\n";	2904	or die "unable to load archetypes\n";
2583	}	2905	}
2584		2906
2585	sub reload_treasures {	2907	sub reload_treasures {
…		…
2779	%EXT_CORO = ();	3101	%EXT_CORO = ();
2780		3102
2781	warn "removing commands";	3103	warn "removing commands";
2782	%COMMAND = ();	3104	%COMMAND = ();
2783		3105
2784	warn "removing ext commands";	3106	warn "removing ext/exti commands";
2785	%EXTCMD = ();	3107	%EXTCMD = ();
		3108	%EXTICMD = ();
2786		3109
2787	warn "unloading/nuking all extensions";	3110	warn "unloading/nuking all extensions";
2788	for my $pkg (@EXTS) {	3111	for my $pkg (@EXTS) {
2789	warn "... unloading $pkg";	3112	warn "... unloading $pkg";
2790		3113

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs. Revision 1.315 by root, Mon Jul 23 17:53:55 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.315 by root, Mon Jul 23 17:53:55 2007 UTC