[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC.pm

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.170 by root, Thu Dec 27 13:20:48 2007 UTC vs.
Revision 1.216 by root, Sat Nov 17 10:40:08 2012 UTC

…		…
14		14
15	package DC;	15	package DC;
16		16
17	use Carp ();	17	use Carp ();
18		18
		19	our $VERSION;
		20
19	BEGIN {	21	BEGIN {
20	$VERSION = '0.9963';	22	$VERSION = '3.0';
21		23
22	use XSLoader;	24	use XSLoader;
23	XSLoader::load "Deliantra::Client", $VERSION;	25	XSLoader::load "Deliantra::Client", $VERSION;
24	}	26	}
25		27
26	use utf8;	28	use utf8;
		29	use strict qw(vars subs);
27		30
		31	use Socket ();
28	use AnyEvent ();	32	use AnyEvent ();
		33	use AnyEvent::Util ();
29	use Pod::POM ();	34	use Pod::POM ();
30	use File::Path ();	35	use File::Path ();
31	use Storable (); # finally	36	use Storable (); # finally
32	use Fcntl ();	37	use Fcntl ();
33	use JSON::XS qw(encode_json decode_json);	38	use JSON::XS qw(encode_json decode_json);
		39	use Guard qw(guard);
34		40
35	=item guard { BLOCK }	41	# modules to support other DC::* packages
		42	use List::Util ();
		43	use IO::AIO ();
		44	use Coro::AIO ();
		45	use AnyEvent::AIO ();
36		46
37	Returns an object that executes the given block as soon as it is destroyed.	47	use Deliantra::Util ();
38		48	use Deliantra::Protocol::Constants ();
39	=cut
40
41	sub guard(&) {
42	bless \(my $cb = $_[0]), "DC::Guard"
43	}
44
45	sub DC::Guard::DESTROY {
46	${$_[0]}->()
47	}
48		49
49	=item shorten $string[, $maxlength]	50	=item shorten $string[, $maxlength]
50		51
51	=cut	52	=cut
52		53
…		…
64	s/</</g;	65	s/</</g;
65		66
66	$_	67	$_
67	}	68	}
68		69
69	sub socketpipe() {
70	socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
71	or die "cannot establish bidirectional pipe: $!\n";
72
73	($fh1, $fh2)
74	}
75
76	sub background(&;&) {	70	sub background(&;&) {
77	my ($bg, $cb) = @_;	71	my ($bg, $cb) = @_;
78		72
79	my ($fh_r, $fh_w) = DC::socketpipe;	73	my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
		74	or die "unable to create background socketpair: $!";
80		75
81	my $pid = fork;	76	my $pid = fork;
82		77
83	if (defined $pid && !$pid) {	78	if (defined $pid && !$pid) {
84	local $SIG{__DIE__};	79	local $SIG{__DIE__};
…		…
140	print $msg, "\n";	135	print $msg, "\n";
141	}	136	}
142		137
143	package DC;	138	package DC;
144		139
		140	our $RC_THEME;
		141	our %THEME;
		142	our @RC_PATH;
		143	our $RC_BASE;
		144
		145	for (grep !ref, @INC) {
		146	$RC_BASE = "$_/Deliantra/Client/private/resources";
		147	last if -d $RC_BASE;
		148	}
		149
145	sub find_rcfile($) {	150	sub find_rcfile($) {
146	my $path;	151	my $path;
147		152
148	for (grep !ref, @INC) {	153	for (@RC_PATH, "") {
149	$path = "$_/Deliantra/Client/private/resources/$_[0]";	154	$path = "$RC_BASE/$_/$_[0]";
150	return $path if -r $path;	155	return $path if -e $path;
151	}	156	}
152		157
153	die "FATAL: can't find required file $_[0]\n";	158	die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
154	}	159	}
155		160
156	sub read_cfg {	161	sub load_json($) {
157	my ($file) = @_;	162	my ($file) = @_;
158		163
159	open my $fh, $file	164	open my $fh, $file
160	or return;	165	or return;
161		166
162	local $/;	167	local $/;
163	my $CFG = <$fh>;	168	eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
164
165	$::CFG = decode_json $CFG;
166	}	169	}
167		170
		171	sub set_theme($) {
		172	return if $RC_THEME eq $_[0];
		173	$RC_THEME = $_[0];
		174
		175	# kind of hacky, find the main theme file, then load all theme files and merge them
		176
		177	%THEME = ();
		178	@RC_PATH = "theme-$RC_THEME";
		179
		180	my $theme = load_json find_rcfile "theme.json"
		181	or die "FATAL: theme resource file not found";
		182
		183	@RC_PATH = @{ $theme->{path} } if $theme->{path};
		184
		185	for (@RC_PATH, "") {
		186	my $theme = load_json "$RC_BASE/$_/theme.json"
		187	or next;
		188
		189	%THEME = ( %$theme, %THEME );
		190	}
		191	}
		192
168	sub write_cfg {	193	sub read_cfg($) {
169	my ($file) = @_;	194	my ($file) = @_;
170		195
		196	$::CFG = (load_json $file) \|\| (load_json "$file.bak");
		197	}
		198
		199	sub write_cfg($) {
		200	my $file = "$Deliantra::VARDIR/client.cf";
		201
171	$::CFG->{VERSION} = $::VERSION;	202	$::CFG->{VERSION} = $::VERSION;
		203	$::CFG->{layout} = DC::UI::get_layout ();
172		204
173	open my $fh, ">:utf8", $file	205	open my $fh, ">:utf8", "$file~"
174	or return;	206	or return;
175	print $fh encode_json $::CFG;	207	print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
		208	close $fh;
		209
		210	rename $file, "$file.bak";
		211	rename "$file~", $file;
		212	}
		213
		214	sub load_cfg() {
		215	if (-e "$Deliantra::VARDIR/client.cf") {
		216	DC::read_cfg "$Deliantra::VARDIR/client.cf";
		217	} else {
		218	$::CFG = { cfg_schema => 1, db_schema => 1 };
		219	}
		220	}
		221
		222	sub save_cfg() {
		223	write_cfg "$Deliantra::VARDIR/client.cf";
		224	}
		225
		226	sub upgrade_cfg() {
		227	my %DEF_CFG = (
		228	config_autosave => 1,
		229	sdl_mode => undef,
		230	fullscreen => 1,
		231	fast => 0,
		232	force_opengl11 => undef,
		233	disable_alpha => 0,
		234	smooth_movement => 1,
		235	smooth_transitions => 1,
		236	texture_compression => 1,
		237	map_scale => 1,
		238	fow_enable => 1,
		239	fow_intensity => 0,
		240	fow_texture => 0,
		241	map_smoothing => 1,
		242	gui_fontsize => 1,
		243	log_fontsize => 0.7,
		244	gauge_fontsize => 1,
		245	gauge_size => 0.35,
		246	stat_fontsize => 0.7,
		247	mapsize => 100,
		248	audio_enable => 1,
		249	audio_hw_channels => 0,
		250	audio_hw_frequency => 0,
		251	audio_hw_chunksize => 0,
		252	audio_mix_channels => 8,
		253	effects_enable => 1,
		254	effects_volume => 1,
		255	bgm_enable => 1,
		256	bgm_volume => 0.5,
		257	output_rate => "",
		258	pickup => Deliantra::Protocol::Constants::PICKUP_SPELLBOOK
		259	\| Deliantra::Protocol::Constants::PICKUP_SKILLSCROLL
		260	\| Deliantra::Protocol::Constants::PICKUP_VALUABLES,
		261	inv_sort => "mtime",
		262	default => "profile", # default profile
		263	show_tips => 1,
		264	logview_max_par => 1000,
		265	shift_fire_stop => 0,
		266	uitheme => "wood",
		267	map_shift_x => -24, # arbitrary
		268	map_shift_y => +24, # arbitrary
		269	);
		270
		271	while (my ($k, $v) = each %DEF_CFG) {
		272	$::CFG->{$k} = $v unless exists $::CFG->{$k};
		273	}
		274
		275	if ($::CFG->{cfg_schema} < 1) {
		276	for my $profile (values %{ $::CFG->{profile} }) {
		277	$profile->{password} = unpack "H*", Deliantra::Util::hash_pw $profile->{password};
		278	}
		279	$::CFG->{cfg_schema} = 1;
		280	}
176	}	281	}
177		282
178	sub http_proxy {	283	sub http_proxy {
179	my @proxy = win32_proxy_info;	284	my @proxy = win32_proxy_info;
180		285
…		…
198	require LWP::UserAgent;	303	require LWP::UserAgent;
199		304
200	DC::set_proxy;	305	DC::set_proxy;
201		306
202	my $ua = LWP::UserAgent->new (	307	my $ua = LWP::UserAgent->new (
203	agent => "cfplus $VERSION",	308	agent => "deliantra $VERSION",
204	keep_alive => 1,	309	keep_alive => 1,
205	env_proxy => 1,	310	env_proxy => 1,
206	timeout => 30,	311	timeout => 30,
207	);	312	);
208	}	313	}
…		…
223	$nb = (! ! $nb) + 0;	328	$nb = (! ! $nb) + 0;
224	ioctl $fh, 0x8004667e, \$nb; # FIONBIO	329	ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225	} else {	330	} else {
226	fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;	331	fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227	}	332	}
228
229	}	333	}
230		334
231	package DC::Layout;	335	package DC::Layout;
232		336
233	$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {	337	$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.170 by root, Thu Dec 27 13:20:48 2007 UTC vs. Revision 1.216 by root, Sat Nov 17 10:40:08 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.170 by root, Thu Dec 27 13:20:48 2007 UTC vs.
Revision 1.216 by root, Sat Nov 17 10:40:08 2012 UTC