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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.314 by root, Mon Jul 23 16:53:15 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]
		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	Useful for short background jobs.
		334
		335	=cut
		336
		337	our @SLOT_QUEUE;
		338	our $SLOT_QUEUE;
		339
		340	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		341	$SLOT_QUEUE = Coro::async {
		342	my $signal = new Coro::Signal;
		343
		344	while () {
		345	next_job:
		346	my $avail = cf::till_tick;
		347	if ($avail > 0.01) {
		348	for (0 .. $#SLOT_QUEUE) {
		349	if ($SLOT_QUEUE[$_][0] < $avail) {
		350	my $job = splice @SLOT_QUEUE, $_, 1, ();
		351	$job->[2]->send;
		352	Coro::cede;
		353	goto next_job;
		354	}
		355	}
		356	}
		357
		358	if (@SLOT_QUEUE) {
		359	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		360	push @cf::WAIT_FOR_TICK, $signal;
		361	$signal->wait;
		362	} else {
		363	Coro::schedule;
		364	}
		365	}
		366	};
		367
		368	sub get_slot($;$) {
		369	my ($time, $pri) = @_;
		370
		371	push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal];
		372	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		373	$SLOT_QUEUE->ready;
		374	$sig->wait;
311	}	375	}
312		376
313	=item cf::async { BLOCK }	377	=item cf::async { BLOCK }
314		378
315	Currently the same as Coro::async_pool, meaning you cannot use	379	Currently the same as Coro::async_pool, meaning you cannot use
…		…
402	Coro::Storable. May, of course, block. Note that the executed sub may	466	Coro::Storable. May, of course, block. Note that the executed sub may
403	never block itself or use any form of Event handling.	467	never block itself or use any form of Event handling.
404		468
405	=cut	469	=cut
406		470
		471	sub _store_scalar {
		472	open my $fh, ">", \my $buf
		473	or die "fork_call: cannot open fh-to-buf in child : $!";
		474	Storable::store_fd $_[0], $fh;
		475	close $fh;
		476
		477	$buf
		478	}
		479
407	sub fork_call(&@) {	480	sub fork_call(&@) {
408	my ($cb, @args) = @_;	481	my ($cb, @args) = @_;
409		482
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	483	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411	# or die "socketpair: $!";	484	# or die "socketpair: $!";
…		…
414		487
415	if (my $pid = fork) {	488	if (my $pid = fork) {
416	close $fh2;	489	close $fh2;
417		490
418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);	491	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		492	warn "pst<$res>" unless $res =~ /^pst/;
419	$res = Coro::Storable::thaw $res;	493	$res = Coro::Storable::thaw $res;
420		494
421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave	495	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422		496
423	die $$res unless "ARRAY" eq ref $res;	497	Carp::confess $$res unless "ARRAY" eq ref $res;
424		498
425	return wantarray ? @$res : $res->[-1];	499	return wantarray ? @$res : $res->[-1];
426	} else {	500	} else {
427	reset_signals;	501	reset_signals;
428	local $SIG{__WARN__};	502	local $SIG{__WARN__};
429	local $SIG{__DIE__};	503	local $SIG{__DIE__};
		504	# just in case, this hack effectively disables event
		505	# in the child. cleaner and slower would be canceling all watchers,
		506	# but this works for the time being.
		507	local $Coro::idle;
		508	$Coro::current->prio (Coro::PRIO_MAX);
		509
430	eval {	510	eval {
431	close $fh1;	511	close $fh1;
432		512
433	my @res = eval { $cb->(@args) };	513	my @res = eval { $cb->(@args) };
		514
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);	515	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
		516	close $fh2;
435	};	517	};
436		518
437	warn $@ if $@;	519	warn $@ if $@;
438	_exit 0;	520	_exit 0;
439	}	521	}
…		…
840	";	922	";
841	die if $@;	923	die if $@;
842	}	924	}
843		925
844	our $override;	926	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	927	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		928
847	sub override {	929	sub override {
848	$override = 1;	930	$override = 1;
849	@invoke_results = ();	931	@INVOKE_RESULTS = (@_);
850	}	932	}
851		933
852	sub do_invoke {	934	sub do_invoke {
853	my $event = shift;	935	my $event = shift;
854	my $callbacks = shift;	936	my $callbacks = shift;
855		937
856	@invoke_results = ();	938	@INVOKE_RESULTS = ();
857		939
858	local $override;	940	local $override;
859		941
860	for (@$callbacks) {	942	for (@$callbacks) {
861	eval { &{$_->[1]} };	943	eval { &{$_->[1]} };
…		…
878		960
879	Generate an object-specific event with the given arguments.	961	Generate an object-specific event with the given arguments.
880		962
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	963	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	964	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	965	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		966
885	=back	967	=back
886		968
887	=cut	969	=cut
888		970
889	#############################################################################	971	#############################################################################
890	# object support	972	# object support
		973	#
		974
		975	sub _can_merge {
		976	my ($ob1, $ob2) = @_;
		977
		978	local $Storable::canonical = 1;
		979	my $fob1 = Storable::freeze $ob1;
		980	my $fob2 = Storable::freeze $ob2;
		981
		982	$fob1 eq $fob2
		983	}
891		984
892	sub reattach {	985	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	986	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	987	my ($obj) = @_;
895		988
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1122	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1123	}
1031		1124
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1125	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1126
1034	Register a callback fro execution when the client sends an extcmd packet.	1127	Register a callback for execution when the client sends an (synchronous)
		1128	extcmd packet. Ext commands will be processed in the order they are
		1129	received by the server, like other user commands. The first argument is
		1130	the logged-in player. Ext commands can only be processed after a player
		1131	has logged in successfully.
1035		1132
1036	If the callback returns something, it is sent back as if reply was being	1133	If the callback returns something, it is sent back as if reply was being
1037	called.	1134	called.
1038		1135
		1136	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1137
		1138	Register a callback for execution when the client sends an (asynchronous)
		1139	exticmd packet. Exti commands are processed by the server as soon as they
		1140	are received, i.e. out of order w.r.t. other commands. The first argument
		1141	is a client socket. Exti commands can be received anytime, even before
		1142	log-in.
		1143
		1144	If the callback returns something, it is sent back as if reply was being
		1145	called.
		1146
1039	=cut	1147	=cut
1040		1148
1041	sub register_extcmd {	1149	sub register_extcmd {
1042	my ($name, $cb) = @_;	1150	my ($name, $cb) = @_;
1043		1151
1044	$EXTCMD{$name} = $cb;	1152	$EXTCMD{$name} = $cb;
		1153	}
		1154
		1155	sub register_exticmd {
		1156	my ($name, $cb) = @_;
		1157
		1158	$EXTICMD{$name} = $cb;
1045	}	1159	}
1046		1160
1047	cf::player->attach (	1161	cf::player->attach (
1048	on_command => sub {	1162	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1163	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1172	cf::override;
1059	},	1173	},
1060	on_extcmd => sub {	1174	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1175	my ($pl, $buf) = @_;
1062		1176
1063	my $msg = eval { from_json $buf };	1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1178
1065	if (ref $msg) {	1179	if (ref $msg) {
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1180	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1181	if (my %reply = $cb->($pl, $msg)) {
1068	$pl->ext_reply ($msg->{msgid}, %reply);	1182	$pl->ext_reply ($msg->{msgid}, %reply);
…		…
1347	}	1461	}
1348		1462
1349	\@paths	1463	\@paths
1350	}	1464	}
1351		1465
		1466	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1467
		1468	Expand crossfire pod fragments into protocol xml.
		1469
		1470	=cut
		1471
		1472	sub expand_cfpod {
		1473	((my $self), (local $_)) = @_;
		1474
		1475	# escape & and <
		1476	s/&/&/g;
		1477	s/(?<![BIUGH])</</g;
		1478
		1479	# this is buggy, it needs to properly take care of nested <'s
		1480
		1481	1 while
		1482	# replace B<>, I<>, U<> etc.
		1483	s/B<([^\>]*)>/<b>$1<\/b>/
		1484	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
		1485	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1486	# replace G<male\|female> tags
		1487	\|\| s{G<([^>\|])\\|([^>])>}{
		1488	$self->gender ? $2 : $1
		1489	}ge
		1490	# replace H<hint text>
		1491	\|\| s{H<([^\>]*)>}
		1492	{
		1493	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1494	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1495	"")
		1496	[$self->{hintmode}]
		1497	}ge;
		1498
		1499	# create single paragraphs (very hackish)
		1500	s/(?<=\S)\n(?=\w)/ /g;
		1501
		1502	# compress some whitespace
		1503	s/\s+\n/\n/g; # ws line-ends
		1504	s/\n\n+/\n/g; # double lines
		1505	s/^\n+//; # beginning lines
		1506	s/\n+$//; # ending lines
		1507
		1508	$_
		1509	}
		1510
		1511	sub hintmode {
		1512	$_[0]{hintmode} = $_[1] if @_ > 1;
		1513	$_[0]{hintmode}
		1514	}
		1515
1352	=item $player->ext_reply ($msgid, %msg)	1516	=item $player->ext_reply ($msgid, %msg)
1353		1517
1354	Sends an ext reply to the player.	1518	Sends an ext reply to the player.
1355		1519
1356	=cut	1520	=cut
1357		1521
1358	sub ext_reply($$%) {	1522	sub ext_reply($$%) {
1359	my ($self, $id, %msg) = @_;	1523	my ($self, $id, %msg) = @_;
1360		1524
1361	$msg{msgid} = $id;	1525	$msg{msgid} = $id;
1362		1526	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1527	}
1365		1528
1366	=item $player->ext_event ($type, %msg)	1529	=item $player->ext_event ($type, %msg)
1367		1530
1368	Sends an ext event to the client.	1531	Sends an ext event to the client.
…		…
1393	my ($path) = @_;	1556	my ($path) = @_;
1394		1557
1395	my ($match, $specificity);	1558	my ($match, $specificity);
1396		1559
1397	for my $region (list) {	1560	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1561	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1562	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1563	if $region->specificity > $specificity;
1401	}	1564	}
1402	}	1565	}
1403		1566
…		…
1523	$self->init; # pass $1 etc.	1686	$self->init; # pass $1 etc.
1524	return $self;	1687	return $self;
1525	}	1688	}
1526	}	1689	}
1527		1690
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1691	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1692	()
1530	}	1693	}
1531		1694
1532	sub init {	1695	sub init {
1533	my ($self) = @_;	1696	my ($self) = @_;
…		…
1811		1974
1812	undef $MAP_PREFETCH{$path};	1975	undef $MAP_PREFETCH{$path};
1813	$MAP_PREFETCHER \|\|= cf::async {	1976	$MAP_PREFETCHER \|\|= cf::async {
1814	while (%MAP_PREFETCH) {	1977	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	1978	for my $path (keys %MAP_PREFETCH) {
1816	my $map = find $path	1979	if (my $map = find $path) {
1817	or next;
1818	$map->load;	1980	$map->load;
		1981	}
1819		1982
1820	delete $MAP_PREFETCH{$path};	1983	delete $MAP_PREFETCH{$path};
1821	}	1984	}
1822	}	1985	}
1823	undef $MAP_PREFETCHER;	1986	undef $MAP_PREFETCHER;
…		…
2052	my $pl = $self->contr;	2215	my $pl = $self->contr;
2053		2216
2054	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2217	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055	my $diag = $pl->{npc_dialog};	2218	my $diag = $pl->{npc_dialog};
2056	$diag->{pl}->ext_reply (	2219	$diag->{pl}->ext_reply (
2057	$diag->{id}, msgtype => "reply", msg => $msg, add_topics => []	2220	$diag->{id},
		2221	msgtype => "reply",
		2222	msg => $diag->{pl}->expand_cfpod ($msg),
		2223	add_topics => []
2058	);	2224	);
2059		2225
2060	} else {	2226	} else {
2061	$msg = $npc->name . " says: $msg" if $npc;	2227	$msg = $npc->name . " says: $msg" if $npc;
2062	$self->message ($msg, $flags);	2228	$self->message ($msg, $flags);
…		…
2157		2323
2158	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2324	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159	$self->enter_map ($map, $x, $y);	2325	$self->enter_map ($map, $x, $y);
2160	}	2326	}
2161		2327
2162	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2328	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163		2329
2164	Moves the player to the given map-path and coordinates by first freezing	2330	Moves the player to the given map-path and coordinates by first freezing
2165	her, loading and preparing them map, calling the provided $check callback	2331	her, loading and preparing them map, calling the provided $check callback
2166	that has to return the map if sucecssful, and then unfreezes the player on	2332	that has to return the map if sucecssful, and then unfreezes the player on
2167	the new (success) or old (failed) map position.	2333	the new (success) or old (failed) map position. In either case, $done will
		2334	be called at the end of this process.
2168		2335
2169	=cut	2336	=cut
2170		2337
2171	our $GOTOGEN;	2338	our $GOTOGEN;
2172		2339
2173	sub cf::object::player::goto {	2340	sub cf::object::player::goto {
2174	my ($self, $path, $x, $y, $check) = @_;	2341	my ($self, $path, $x, $y, $check, $done) = @_;
2175		2342
2176	# do generation counting so two concurrent goto's will be executed in-order	2343	# do generation counting so two concurrent goto's will be executed in-order
2177	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2344	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178		2345
2179	$self->enter_link;	2346	$self->enter_link;
…		…
2199		2366
2200	if ($gen == $self->{_goto_generation}) {	2367	if ($gen == $self->{_goto_generation}) {
2201	delete $self->{_goto_generation};	2368	delete $self->{_goto_generation};
2202	$self->leave_link ($map, $x, $y);	2369	$self->leave_link ($map, $x, $y);
2203	}	2370	}
		2371
		2372	$done->() if $done;
2204	})->prio (1);	2373	})->prio (1);
2205	}	2374	}
2206		2375
2207	=item $player_object->enter_exit ($exit_object)	2376	=item $player_object->enter_exit ($exit_object)
2208		2377
…		…
2277	my $hp = $exit->stats->hp;	2446	my $hp = $exit->stats->hp;
2278	my $sp = $exit->stats->sp;	2447	my $sp = $exit->stats->sp;
2279		2448
2280	$self->enter_link;	2449	$self->enter_link;
2281		2450
		2451	# if exit is damned, update players death & WoR home-position
		2452	$self->contr->savebed ($slaying, $hp, $sp)
		2453	if $exit->flag (FLAG_DAMNED);
		2454
2282	(async {	2455	(async {
2283	$self->deactivate_recursive; # just to be sure	2456	$self->deactivate_recursive; # just to be sure
2284	unless (eval {	2457	unless (eval {
2285	$self->goto ($slaying, $hp, $sp);	2458	$self->goto ($slaying, $hp, $sp);
2286		2459
…		…
2313		2486
2314	utf8::encode $text;	2487	utf8::encode $text;
2315	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2488	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2316	}	2489	}
2317		2490
		2491	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2492
		2493	Send a drawinfo or msg packet to the client, formatting the msg for the
		2494	client if neccessary. C<$type> should be a string identifying the type of
		2495	the message, with C<log> being the default. If C<$color> is negative, suppress
		2496	the message unless the client supports the msg packet.
		2497
		2498	=cut
		2499
		2500	sub cf::client::send_msg {
		2501	my ($self, $channel, $msg, $color, @extra) = @_;
		2502
		2503	$msg = $self->pl->expand_cfpod ($msg);
		2504
		2505	$color &= ~cf::NDI_UNIQUE; # just in case...
		2506
		2507	if (ref $channel) {
		2508	# send meta info to client, if not yet sent
		2509	unless (exists $self->{channel}{$channel->{id}}) {
		2510	$self->{channel}{$channel->{id}} = $channel;
		2511	$self->ext_event (channel_info => %$channel);
		2512	}
		2513
		2514	$channel = $channel->{id};
		2515	}
		2516
		2517	return unless @extra \|\| length $msg;
		2518
		2519	if ($self->can_msg) {
		2520	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
		2521	} else {
		2522	# replace some tags by gcfclient-compatible ones
		2523	for ($msg) {
		2524	1 while
		2525	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2526	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2527	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2528	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2529	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2530	}
		2531
		2532	if ($color >= 0) {
		2533	if (0 && $msg =~ /\[/) {
		2534	$self->send_packet ("drawextinfo $color 4 0 $msg")
		2535	} else {
		2536	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
		2537	$self->send_packet ("drawinfo $color $msg")
		2538	}
		2539	}
		2540	}
		2541	}
		2542
2318	=item $client->ext_event ($type, %msg)	2543	=item $client->ext_event ($type, %msg)
2319		2544
2320	Sends an exti event to the client.	2545	Sends an ext event to the client.
2321		2546
2322	=cut	2547	=cut
2323		2548
2324	sub cf::client::ext_event($$%) {	2549	sub cf::client::ext_event($$%) {
2325	my ($self, $type, %msg) = @_;	2550	my ($self, $type, %msg) = @_;
2326		2551
		2552	return unless $self->extcmd;
		2553
2327	$msg{msgtype} = "event_$type";	2554	$msg{msgtype} = "event_$type";
2328	$self->send_packet ("ext " . cf::to_json \%msg);	2555	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2329	}	2556	}
2330		2557
2331	=item $success = $client->query ($flags, "text", \&cb)	2558	=item $success = $client->query ($flags, "text", \&cb)
2332		2559
2333	Queues a query to the client, calling the given callback with	2560	Queues a query to the client, calling the given callback with
2334	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2561	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2562	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336		2563
2337	Queries can fail, so check the return code. Or don't, as queries will become	2564	Queries can fail, so check the return code. Or don't, as queries will
2338	reliable at some point in the future.	2565	become reliable at some point in the future.
2339		2566
2340	=cut	2567	=cut
2341		2568
2342	sub cf::client::query {	2569	sub cf::client::query {
2343	my ($self, $flags, $text, $cb) = @_;	2570	my ($self, $flags, $text, $cb) = @_;
…		…
2351	utf8::encode $text;	2578	utf8::encode $text;
2352	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2579	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353		2580
2354	$self->send_packet ($self->{query_queue}[0][0])	2581	$self->send_packet ($self->{query_queue}[0][0])
2355	if @{ $self->{query_queue} } == 1;	2582	if @{ $self->{query_queue} } == 1;
		2583
		2584	1
2356	}	2585	}
2357		2586
2358	cf::client->attach (	2587	cf::client->attach (
		2588	on_connect => sub {
		2589	my ($ns) = @_;
		2590
		2591	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2592	},
2359	on_reply => sub {	2593	on_reply => sub {
2360	my ($ns, $msg) = @_;	2594	my ($ns, $msg) = @_;
2361		2595
2362	# this weird shuffling is so that direct followup queries	2596	# this weird shuffling is so that direct followup queries
2363	# get handled first	2597	# get handled first
…		…
2375	} else {	2609	} else {
2376	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2610	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377	}	2611	}
2378	}	2612	}
2379	},	2613	},
		2614	on_exticmd => sub {
		2615	my ($ns, $buf) = @_;
		2616
		2617	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2618
		2619	if (ref $msg) {
		2620	if (my $cb = $EXTICMD{$msg->{msgtype}}) {
		2621	if (my %reply = $cb->($ns, $msg)) {
		2622	$reply{msgid} = $msg->{msgid};
		2623	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
		2624	}
		2625	}
		2626	} else {
		2627	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2628	}
		2629
		2630	cf::override;
		2631	},
2380	);	2632	);
2381		2633
2382	=item $client->async (\&cb)	2634	=item $client->async (\&cb)
2383		2635
2384	Create a new coroutine, running the specified callback. The coroutine will	2636	Create a new coroutine, running the specified callback. The coroutine will
…		…
2433		2685
2434	=pod	2686	=pod
2435		2687
2436	The following functions and methods are available within a safe environment:	2688	The following functions and methods are available within a safe environment:
2437		2689
2438	cf::object contr pay_amount pay_player map	2690	cf::object
		2691	contr pay_amount pay_player map x y force_find force_add
		2692	insert remove
		2693
2439	cf::object::player player	2694	cf::object::player
2440	cf::player peaceful	2695	player
2441	cf::map trigger	2696
		2697	cf::player
		2698	peaceful
		2699
		2700	cf::map
		2701	trigger
2442		2702
2443	=cut	2703	=cut
2444		2704
2445	for (	2705	for (
2446	["cf::object" => qw(contr pay_amount pay_player map)],	2706	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2707	insert remove)],
2447	["cf::object::player" => qw(player)],	2708	["cf::object::player" => qw(player)],
2448	["cf::player" => qw(peaceful)],	2709	["cf::player" => qw(peaceful)],
2449	["cf::map" => qw(trigger)],	2710	["cf::map" => qw(trigger)],
2450	) {	2711	) {
2451	no strict 'refs';	2712	no strict 'refs';
…		…
2543	{	2804	{
2544	my $faces = $facedata->{faceinfo};	2805	my $faces = $facedata->{faceinfo};
2545		2806
2546	while (my ($face, $info) = each %$faces) {	2807	while (my ($face, $info) = each %$faces) {
2547	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2808	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2548	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2809	cf::face::set_visibility $idx, $info->{visibility};
		2810	cf::face::set_magicmap $idx, $info->{magicmap};
2549	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2811	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2550	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2812	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2551	Coro::cede;	2813
		2814	cf::cede_to_tick;
2552	}	2815	}
2553		2816
2554	while (my ($face, $info) = each %$faces) {	2817	while (my ($face, $info) = each %$faces) {
2555	next unless $info->{smooth};	2818	next unless $info->{smooth};
2556	my $idx = cf::face::find $face	2819	my $idx = cf::face::find $face
2557	or next;	2820	or next;
2558	if (my $smooth = cf::face::find $info->{smooth}) {	2821	if (my $smooth = cf::face::find $info->{smooth}) {
		2822	cf::face::set_smooth $idx, $smooth;
2559	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2823	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560	} else {	2824	} else {
2561	warn "smooth face '$info->{smooth}' not found for face '$face'";	2825	warn "smooth face '$info->{smooth}' not found for face '$face'";
2562	}	2826	}
2563	Coro::cede;	2827
		2828	cf::cede_to_tick;
2564	}	2829	}
2565	}	2830	}
2566		2831
2567	{	2832	{
2568	my $anims = $facedata->{animinfo};	2833	my $anims = $facedata->{animinfo};
2569		2834
2570	while (my ($anim, $info) = each %$anims) {	2835	while (my ($anim, $info) = each %$anims) {
2571	cf::anim::set $anim, $info->{frames}, $info->{facings};	2836	cf::anim::set $anim, $info->{frames}, $info->{facings};
2572	Coro::cede;	2837	cf::cede_to_tick;
2573	}	2838	}
2574		2839
2575	cf::anim::invalidate_all; # d'oh	2840	cf::anim::invalidate_all; # d'oh
		2841	}
		2842
		2843	{
		2844	# TODO: for gcfclient pleasure, we should give resources
		2845	# that gcfclient doesn't grok a >10000 face index.
		2846	my $res = $facedata->{resource};
		2847	my $enc = JSON::XS->new->utf8->canonical;
		2848
		2849	while (my ($name, $info) = each %$res) {
		2850	my $meta = $enc->encode ({
		2851	name => $name,
		2852	type => $info->{type},
		2853	copyright => $info->{copyright}, #TODO#
		2854	});
		2855
		2856	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		2857
		2858	if ($name =~ /\.jpg$/) {
		2859	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
		2860	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
		2861	} else {
		2862	my $data = pack "(w/a)", $meta, $info->{data};
		2863	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2864
		2865	cf::face::set_type $idx, 1;
		2866	cf::face::set_data $idx, 0, $data, $chk;
		2867	}
		2868
		2869	cf::cede_to_tick;
		2870	}
2576	}	2871	}
2577		2872
2578	1	2873	1
2579	}	2874	}
2580		2875
2581	sub reload_regions {	2876	sub reload_regions {
2582	load_resource_file "$MAPDIR/regions"	2877	load_resource_file "$MAPDIR/regions"
2583	or die "unable to load regions file\n";	2878	or die "unable to load regions file\n";
		2879
		2880	for (cf::region::list) {
		2881	$_->{match} = qr/$_->{match}/
		2882	if exists $_->{match};
		2883	}
2584	}	2884	}
2585		2885
2586	sub reload_facedata {	2886	sub reload_facedata {
2587	load_facedata "$DATADIR/facedata"	2887	load_facedata "$DATADIR/facedata"
2588	or die "unable to load facedata\n";	2888	or die "unable to load facedata\n";
2589	}	2889	}
2590		2890
2591	sub reload_archetypes {	2891	sub reload_archetypes {
		2892	load_resource_file "$DATADIR/archetypes"
		2893	or die "unable to load archetypes\n";
		2894	#d# NEED to laod twice to resolve forward references
		2895	# this really needs to be done in an extra post-pass
		2896	# (which needs to be synchronous, so solve it differently)
2592	load_resource_file "$DATADIR/archetypes"	2897	load_resource_file "$DATADIR/archetypes"
2593	or die "unable to load archetypes\n";	2898	or die "unable to load archetypes\n";
2594	}	2899	}
2595		2900
2596	sub reload_treasures {	2901	sub reload_treasures {
…		…
2790	%EXT_CORO = ();	3095	%EXT_CORO = ();
2791		3096
2792	warn "removing commands";	3097	warn "removing commands";
2793	%COMMAND = ();	3098	%COMMAND = ();
2794		3099
2795	warn "removing ext commands";	3100	warn "removing ext/exti commands";
2796	%EXTCMD = ();	3101	%EXTCMD = ();
		3102	%EXTICMD = ();
2797		3103
2798	warn "unloading/nuking all extensions";	3104	warn "unloading/nuking all extensions";
2799	for my $pkg (@EXTS) {	3105	for my $pkg (@EXTS) {
2800	warn "... unloading $pkg";	3106	warn "... unloading $pkg";
2801		3107

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs. Revision 1.314 by root, Mon Jul 23 16:53:15 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.314 by root, Mon Jul 23 16:53:15 2007 UTC