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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.70 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.115 by elmex, Tue Aug 15 06:30:05 2006 UTC

…		…
1	=head1 NAME	1	=head1 NAME
2		2
3	CFClient - undocumented utility garbage for our crossfire client	3	CFPlus - undocumented utility garbage for our crossfire client
4		4
5	=head1 SYNOPSIS	5	=head1 SYNOPSIS
6		6
7	use CFClient;	7	use CFPlus;
8		8
9	=head1 DESCRIPTION	9	=head1 DESCRIPTION
10		10
11	=over 4	11	=over 4
12		12
13	=cut	13	=cut
14		14
15	package CFClient;	15	package CFPlus;
16		16
17	BEGIN {	17	BEGIN {
18	$VERSION = '0.1';	18	$VERSION = '0.2';
19		19
20	use XSLoader;	20	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	21	XSLoader::load "CFPlus", $VERSION;
22	}	22	}
23		23
24	use utf8;	24	use utf8;
25		25
26	use Carp ();	26	use Carp ();
27	use AnyEvent ();	27	use AnyEvent ();
28	use BerkeleyDB;	28	use BerkeleyDB;
		29	use Pod::POM ();
		30	use Scalar::Util ();
		31	use Storable (); # finally
		32
		33	=item guard { BLOCK }
		34
		35	Returns an object that executes the given block as soon as it is destroyed.
		36
		37	=cut
		38
		39	sub guard(&) {
		40	bless \(my $cb = $_[0]), "CFPlus::Guard"
		41	}
		42
		43	sub CFPlus::Guard::DESTROY {
		44	${$_[0]}->()
		45	}
		46
		47	sub asxml($) {
		48	local $_ = $_[0];
		49
		50	s/&/&/g;
		51	s/>/>/g;
		52	s/</</g;
		53
		54	$_
		55	}
		56
		57	package CFPlus::Database;
		58
		59	our @ISA = BerkeleyDB::Btree::;
		60
		61	sub get($$) {
		62	my $data;
		63
		64	$_[0]->db_get ($_[1], $data) == 0
		65	? $data
		66	: ()
		67	}
		68
		69	my %DB_SYNC;
		70
		71	sub put($$$) {
		72	my ($db, $key, $data) = @_;
		73
		74	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
		75
		76	$db->db_put ($key => $data)
		77	}
		78
		79	package CFPlus;
29		80
30	sub find_rcfile($) {	81	sub find_rcfile($) {
31	my $path;	82	my $path;
32		83
33	for (grep !ref, @INC) {	84	for (grep !ref, @INC) {
34	$path = "$_/CFClient/resources/$_[0]";	85	$path = "$_/CFPlus/resources/$_[0]";
35	return $path if -r $path;	86	return $path if -r $path;
36	}	87	}
37		88
38	die "FATAL: can't find required file $_[0]\n";	89	die "FATAL: can't find required file $_[0]\n";
39	}	90	}
40		91
		92	BEGIN {
		93	use Crossfire::Protocol::Base ();
		94	*to_json = \&Crossfire::Protocol::Base::to_json;
		95	*from_json = \&Crossfire::Protocol::Base::from_json;
		96	}
		97
41	sub read_cfg {	98	sub read_cfg {
42	my ($file) = @_;	99	my ($file) = @_;
43		100
44	open CFG, $file	101	open my $fh, $file
45	or return;	102	or return;
46		103
47	my $CFG;
48
49	local $/;	104	local $/;
50	$CFG = eval <CFG>;	105	my $CFG = <$fh>;
51		106
52	$::CFG = $CFG;	107	if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
53		108	require YAML;
54	close CFG;	109	utf8::decode $CFG;
		110	$::CFG = YAML::Load ($CFG);
		111	} elsif ($CFG =~ /^\{/) {
		112	$::CFG = from_json $CFG;
		113	} else {
		114	$::CFG = eval $CFG; ## todo comaptibility cruft
		115	}
55	}	116	}
56		117
57	sub write_cfg {	118	sub write_cfg {
58	my ($file) = @_;	119	my ($file) = @_;
59		120
60	open CFG, ">$file"	121	$::CFG->{VERSION} = $::VERSION;
		122
		123	open my $fh, ">:utf8", $file
61	or return;	124	or return;
62		125	print $fh to_json $::CFG;
63	{
64	require Data::Dumper;
65	local $Data::Dumper::Purity = 1;
66	$::CFG->{VERSION} = $::VERSION;
67	print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
68	}
69
70	close CFG;
71	}	126	}
72		127
		128	our $DB_ENV;
		129
		130	{
		131	use strict;
		132
73	mkdir "$Crossfire::VARDIR/pclient", 0777;	133	mkdir "$Crossfire::VARDIR/cfplus", 0777;
		134	my $recover = $BerkeleyDB::db_version >= 4.4
		135	? eval "DB_REGISTER \| DB_RECOVER"
		136	: 0;
74		137
75	our $DB_ENV = new BerkeleyDB::Env	138	$DB_ENV = new BerkeleyDB::Env
76	-Home => "$Crossfire::VARDIR/pclient",	139	-Home => "$Crossfire::VARDIR/cfplus",
77	-Cachesize => 1_000_000,	140	-Cachesize => 1_000_000,
78	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	141	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
79	# -ErrPrefix => "DATABASE",	142	# -ErrPrefix => "DATABASE",
80	-Verbose => 1,	143	-Verbose => 1,
81	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	144	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		145	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
82	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	146	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		147	}
83		148
84	sub db_table($) {	149	sub db_table($) {
85	my ($table) = @_;	150	my ($table) = @_;
86		151
87	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	152	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
88		153
89	new CFClient::Database	154	new CFPlus::Database
90	-Env => $DB_ENV,	155	-Env => $DB_ENV,
91	-Filename => $table,	156	-Filename => $table,
92	# -Filename => "database",	157	# -Filename => "database",
93	# -Subname => $table,	158	# -Subname => $table,
94	-Property => DB_CHKSUM,	159	-Property => DB_CHKSUM,
95	-Flags => DB_CREATE \| DB_UPGRADE,	160	-Flags => DB_CREATE \| DB_UPGRADE,
96	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	161	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
97	}	162	}
98		163
99	sub pod_to_pango($) {	164	package CFPlus::Layout;
100	my ($pom) = @_;
101		165
102	$pom->present ("CFClient::PodToPango")	166	$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
103	}	167	reset_glyph_cache;
104
105	sub pod_to_pango_list($) {
106	my ($pom) = @_;
107
108	[
109	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
110	split /\n/, $pom->present ("CFClient::PodToPango")
111	]
112	}
113
114	package CFClient::PodToPango;
115
116	use base Pod::POM::View::Text;
117
118	our $indent = 0;
119
120	*view_seq_code =
121	*view_seq_bold = sub { "<b>$_[1]</b>" };
122	*view_seq_italic = sub { "<i>$_[1]</i>" };
123	*view_seq_space =
124	*view_seq_link =
125	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
126
127	sub view_seq_text {
128	my $text = $_[1];
129	$text =~ s/\s+/ /g;
130	CFClient::UI::Label::escape ($text)
131	}
132
133	sub view_item {
134	("\t" x ($indent / 4))
135	. $_[1]->title->present ($_[0])
136	. "\n"
137	. $_[1]->content->present ($_[0])
138	}
139
140	sub view_verbatim {
141	(join "",
142	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
143	split /\n/, CFClient::UI::Label::escape ($_[1]))
144	. "\n"
145	}
146
147	sub view_textblock {
148	("\t" x ($indent / 2)) . "$_[1]\n\n"
149	}
150
151	sub view_head1 {
152	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
153	. $_[1]->content->present ($_[0])
154	};	168	};
155		169
156	sub view_head2 {
157	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
158	. $_[1]->content->present ($_[0])
159	};
160
161	sub view_head3 {
162	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
163	. $_[1]->content->present ($_[0])
164	};
165
166	sub view_over {
167	local $indent = $indent + $_[1]->indent;
168	$_[1]->content->present ($_[0])
169	}
170
171	package CFClient::Database;
172
173	our @ISA = BerkeleyDB::Btree::;
174
175	sub get($$) {
176	my $data;
177
178	$_[0]->db_get ($_[1], $data) == 0
179	? $data
180	: ()
181	}
182
183	my %DB_SYNC;
184
185	sub put($$$) {
186	my ($db, $key, $data) = @_;
187
188	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
189
190	$db->db_put ($key => $data)
191	}
192
193	package CFClient::Item;	170	package CFPlus::Item;
		171
		172	use strict;
		173	use Crossfire::Protocol::Constants;
		174
		175	my $last_enter_count = 1;
194		176
195	sub desc_string {	177	sub desc_string {
196	my ($self) = @_;	178	my ($self) = @_;
197		179
198	my $desc =	180	my $desc =
199	$self->{nrof} < 2	181	$self->{nrof} < 2
200	? $self->{name}	182	? $self->{name}
201	: "$self->{nrof} × $self->{name_pl}";	183	: "$self->{nrof} × $self->{name_pl}";
202		184
203	$self->{flags} & Crossfire::Protocol::F_OPEN	185	$self->{flags} & F_OPEN
204	and $desc .= " (open)";	186	and $desc .= " (open)";
205	$self->{flags} & Crossfire::Protocol::F_APPLIED	187	$self->{flags} & F_APPLIED
206	and $desc .= " (applied)";	188	and $desc .= " (applied)";
207	$self->{flags} & Crossfire::Protocol::F_UNPAID	189	$self->{flags} & F_UNPAID
208	and $desc .= " (unpaid)";	190	and $desc .= " (unpaid)";
209	$self->{flags} & Crossfire::Protocol::F_MAGIC	191	$self->{flags} & F_MAGIC
210	and $desc .= " (magic)";	192	and $desc .= " (magic)";
211	$self->{flags} & Crossfire::Protocol::F_CURSED	193	$self->{flags} & F_CURSED
212	and $desc .= " (cursed)";	194	and $desc .= " (cursed)";
213	$self->{flags} & Crossfire::Protocol::F_DAMNED	195	$self->{flags} & F_DAMNED
214	and $desc .= " (damned)";	196	and $desc .= " (damned)";
215	$self->{flags} & Crossfire::Protocol::F_LOCKED	197	$self->{flags} & F_LOCKED
216	and $desc .= " *";	198	and $desc .= " *";
217		199
218	$desc	200	$desc
219	}	201	}
220		202
224	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	206	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
225		207
226	$weight < 0 ? "?" : $weight * 0.001	208	$weight < 0 ? "?" : $weight * 0.001
227	}	209	}
228		210
		211	sub do_n_dialog {
		212	my ($cb) = @_;
		213
		214	my $w = new CFPlus::UI::Toplevel
		215	on_delete => sub { $_[0]->destroy; 1 },
		216	has_close_button => 1,
		217	;
		218
		219	$w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
		220	$vb->add (new CFPlus::UI::Label text => "Enter item count:");
		221	$vb->add (my $entry = new CFPlus::UI::Entry
		222	text => $last_enter_count,
		223	on_activate => sub {
		224	my ($entry) = @_;
		225	$last_enter_count = $entry->get_text;
		226	$cb->($last_enter_count);
		227	$w->hide;
		228	$w->destroy;
		229
		230	0
		231	},
		232	on_escape => sub { $w->destroy; 1 },
		233	);
		234	$entry->grab_focus;
		235	$w->show;
		236	}
		237
229	sub update_widgets {	238	sub update_widgets {
230	my ($self) = @_;	239	my ($self) = @_;
231		240
		241	# necessary to avoid cyclic references
		242	Scalar::Util::weaken $self;
		243
232	my $button_cb = sub {	244	my $button_cb = sub {
233	my (undef, $ev, $x, $y) = @_;	245	my (undef, $ev, $x, $y) = @_;
234		246
235	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
236	my $targ = $::CONN->{player}{tag};	247	my $targ = $::CONN->{player}{tag};
237		248
238	if ($self->{container} == $::CONN->{player}{tag}) {	249	if ($self->{container} == $::CONN->{player}{tag}) {
239	$targ = $::CONN->{open_container};	250	$targ = $::CONN->{open_container};
240	}	251	}
241		252
		253	if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
242	$::CONN->send ("move $targ $self->{tag} 0");	254	$::CONN->send ("move $targ $self->{tag} 0")
		255	if $targ \|\| !($self->{flags} & F_LOCKED);
		256	} elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
		257	$self->{flags} & F_LOCKED
		258	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		259	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
243	} elsif ($ev->{button} == 1) {	260	} elsif ($ev->{button} == 1) {
244	$::CONN->send ("examine $self->{tag}");	261	$::CONN->send ("examine $self->{tag}");
245	} elsif ($ev->{button} == 2) {	262	} elsif ($ev->{button} == 2) {
246	$::CONN->send ("apply $self->{tag}");	263	$::CONN->send ("apply $self->{tag}");
247	} elsif ($ev->{button} == 3) {	264	} elsif ($ev->{button} == 3) {
		265	my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
		266	if ($self->{container} == $::CONN->{open_container}) {
		267	$move_prefix = "take";
		268	}
		269
248	my @menu_items = (	270	my @menu_items = (
249	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	271	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
250	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	272	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		273	["ignite/thaw", # first try of an easier use of flint&steel
		274	sub {
		275	$::CONN->send ("mark ". pack "N", $self->{tag});
		276	$::CONN->send ("command apply flint and steel");
		277	}
		278	],
		279	["inscribe", # first try of an easier use of flint&steel
		280	sub {
		281	&::open_string_query ("Text to inscribe", sub {
		282	my ($entry, $txt) = @_;
		283	$::CONN->send ("mark ". pack "N", $self->{tag});
		284	$::CONN->send ("command use_skill inscription $txt");
		285	});
		286	}
		287	],
		288	["rename", # first try of an easier use of flint&steel
		289	sub {
		290	&::open_string_query ("Rename item to:", sub {
		291	my ($entry, $txt) = @_;
		292	$::CONN->send ("mark ". pack "N", $self->{tag});
		293	$::CONN->send ("command rename to <$txt>");
		294	}, $self->{name},
		295	"If you input no name or erase the current custom name, the custom name will be unset");
		296	}
		297	],
251	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	298	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
252	(	299	(
253	$self->{flags} & Crossfire::Protocol::F_LOCKED	300	$self->{flags} & F_LOCKED
254	? (	301	? (
255	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	302	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
256	)	303	)
257	: (	304	: (
258	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	305	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
259	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	306	["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
		307	["$move_prefix <n>",
		308	sub {
		309	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		310	}
		311	]
260	)	312	)
261	),	313	),
262	);	314	);
263		315
264	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	316	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
265	}	317	}
266		318
267	1	319	1
268	};	320	};
269		321
270	my $tooltip_std = "<small>"	322	my $tooltip_std = "<small>"
271	. "Left click - examine item\n"	323	. "Left click - examine item\n"
272	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	324	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
273	. "Middle click - apply\n"	325	. "Middle click - apply\n"
		326	. "Shift-Middle click - lock/unlock\n"
274	. "Right click - further options"	327	. "Right click - further options"
275	. "</small>\n";	328	. "</small>\n";
276		329
		330	my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
		331	: $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
		332	: undef;
		333
277	$self->{face_widget} \|\|= new CFClient::UI::Face	334	$self->{face_widget} \|\|= new CFPlus::UI::Face
278	can_events => 1,	335	can_events => 1,
279	can_hover => 1,	336	can_hover => 1,
280	anim => $self->{anim},	337	anim => $self->{anim},
281	animspeed => $self->{animspeed}, # TODO# must be set at creation time	338	animspeed => $self->{animspeed}, # TODO# must be set at creation time
282	connect_button_down => $button_cb,	339	on_button_down => $button_cb,
283	;	340	;
		341	$self->{face_widget}{bg} = $bg;
284	$self->{face_widget}{face} = $self->{face};	342	$self->{face_widget}{face} = $self->{face};
285	$self->{face_widget}{anim} = $self->{anim};	343	$self->{face_widget}{anim} = $self->{anim};
286	$self->{face_widget}{animspeed} = $self->{animspeed};	344	$self->{face_widget}{animspeed} = $self->{animspeed};
287	$self->{face_widget}->set_tooltip (	345	$self->{face_widget}->set_tooltip (
288	"<b>Face/Animation.</b>\n"	346	"<b>Face/Animation.</b>\n"
289	. "Item uses face #$self->{face}. "	347	. "Item uses face #$self->{face}. "
290	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")	348	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
291	. "\n\n$tooltip_std"	349	. "\n\n$tooltip_std"
292	);	350	);
293		351
294	$self->{desc_widget} \|\|= new CFClient::UI::Label	352	$self->{desc_widget} \|\|= new CFPlus::UI::Label
295	can_events => 1,	353	can_events => 1,
296	can_hover => 1,	354	can_hover => 1,
297	ellipsise => 2,	355	ellipsise => 2,
298	align => -1,	356	align => -1,
299	connect_button_down => $button_cb,	357	on_button_down => $button_cb,
300	;	358	;
301	my $desc = CFClient::Item::desc_string $self;	359	my $desc = CFPlus::Item::desc_string $self;
		360	$self->{desc_widget}{bg} = $bg;
302	$self->{desc_widget}->set_text ($desc);	361	$self->{desc_widget}->set_text ($desc);
303	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");	362	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
304		363
305	$self->{weight_widget} \|\|= new CFClient::UI::Label	364	$self->{weight_widget} \|\|= new CFPlus::UI::Label
306	can_events => 1,	365	can_events => 1,
307	can_hover => 1,	366	can_hover => 1,
308	ellipsise => 0,	367	ellipsise => 0,
309	align => 0,	368	align => 0,
310	connect_button_down => $button_cb,	369	on_button_down => $button_cb,
311	;	370	;
		371	$self->{weight_widget}{bg} = $bg;
312	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);	372	$self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
313
314	$self->{weight_widget}->set_tooltip (	373	$self->{weight_widget}->set_tooltip (
315	"<b>Weight</b>.\n"	374	"<b>Weight</b>.\n"
316	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")	375	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
317	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	376	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
318	. "\n\n$tooltip_std"	377	. "\n\n$tooltip_std"

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.70 by root, Fri May 26 18:28:23 2006 UTC vs. Revision 1.115 by elmex, Tue Aug 15 06:30:05 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.70 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.115 by elmex, Tue Aug 15 06:30:05 2006 UTC