[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.97 by root, Tue Jul 4 23:23:31 2006 UTC

…		…
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	package CFClient::PodToPango;
		34
		35	use base Pod::POM::View::Text;
		36
		37	our $VERSION = 1; # bump if resultant formatting changes
		38
		39	our $indent = 0;
		40
		41	*view_seq_code =
		42	*view_seq_bold = sub { "<b>$_[1]</b>" };
		43	*view_seq_italic = sub { "<i>$_[1]</i>" };
		44	*view_seq_space =
		45	*view_seq_link =
		46	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
		47
		48	sub view_seq_text {
		49	my $text = $_[1];
		50	$text =~ s/\s+/ /g;
		51	CFClient::UI::Label::escape ($text)
		52	}
		53
		54	sub view_item {
		55	("\t" x ($indent / 4))
		56	. $_[1]->title->present ($_[0])
		57	. "\n\n"
		58	. $_[1]->content->present ($_[0])
		59	}
		60
		61	sub view_verbatim {
		62	(join "",
		63	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
		64	split /\n/, CFClient::UI::Label::escape ($_[1]))
		65	. "\n"
		66	}
		67
		68	sub view_textblock {
		69	("\t" x ($indent / 2)) . "$_[1]\n\n"
		70	}
		71
		72	sub view_head1 {
		73	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		74	. $_[1]->content->present ($_[0])
		75	};
		76
		77	sub view_head2 {
		78	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		79	. $_[1]->content->present ($_[0])
		80	};
		81
		82	sub view_head3 {
		83	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		84	. $_[1]->content->present ($_[0])
		85	};
		86
		87	sub view_over {
		88	local $indent = $indent + $_[1]->indent;
		89	$_[1]->content->present ($_[0])
		90	}
		91
		92	package CFClient::Database;
		93
		94	our @ISA = BerkeleyDB::Btree::;
		95
		96	sub get($$) {
		97	my $data;
		98
		99	$_[0]->db_get ($_[1], $data) == 0
		100	? $data
		101	: ()
		102	}
		103
		104	my %DB_SYNC;
		105
		106	sub put($$$) {
		107	my ($db, $key, $data) = @_;
		108
		109	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
		110
		111	$db->db_put ($key => $data)
		112	}
		113
		114	package CFClient;
29		115
30	sub find_rcfile($) {	116	sub find_rcfile($) {
31	my $path;	117	my $path;
32		118
33	for (grep !ref, @INC) {	119	for (grep !ref, @INC) {
…		…
68	}	154	}
69		155
70	close CFG;	156	close CFG;
71	}	157	}
72		158
		159	our $DB_ENV;
		160
		161	{
		162	use strict;
		163
73	mkdir "$Crossfire::VARDIR/pclient", 0777;	164	mkdir "$Crossfire::VARDIR/cfplus", 0777;
		165	my $recover = $BerkeleyDB::db_version >= 4.4
		166	? eval "DB_REGISTER \| DB_RECOVER"
		167	: 0;
74		168
75	our $DB_ENV = new BerkeleyDB::Env	169	$DB_ENV = new BerkeleyDB::Env
76	-Home => "$Crossfire::VARDIR/pclient",	170	-Home => "$Crossfire::VARDIR/cfplus",
77	-Cachesize => 1_000_000,	171	-Cachesize => 1_000_000,
78	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	172	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
79	# -ErrPrefix => "DATABASE",	173	# -ErrPrefix => "DATABASE",
80	-Verbose => 1,	174	-Verbose => 1,
81	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	175	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		176	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
82	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	177	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		178	}
83		179
84	sub db_table($) {	180	sub db_table($) {
85	my ($table) = @_;	181	my ($table) = @_;
86		182
87	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	183	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
88		184
89	new CFClient::Database	185	new CFClient::Database
90	-Env => $DB_ENV,	186	-Env => $DB_ENV,
91	-Filename => $table,	187	-Filename => $table,
92	# -Filename => "database",	188	# -Filename => "database",
93	# -Subname => $table,	189	# -Subname => $table,
94	-Property => DB_CHKSUM,	190	-Property => DB_CHKSUM,
95	-Flags => DB_CREATE \| DB_UPGRADE,	191	-Flags => DB_CREATE \| DB_UPGRADE,
96	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	192	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
		193	}
		194
		195	my $pod_cache = db_table "pod_cache";
		196
		197	sub load_pod($$$$) {
		198	my ($path, $filtertype, $filterversion, $filtercb) = @_;
		199
		200	stat $path
		201	or die "$path: $!";
		202
		203	my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
		204
		205	my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
		206
		207	return $pom if $chash eq $phash;
		208
		209	my $pod = do {
		210	local $/;
		211	open my $pod, "<:utf8", $_[0]
		212	or die "$_[0]: $!";
		213	<$pod>
		214	};
		215
		216	#utf8::downgrade $pod;
		217
		218	$pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
		219
		220	$pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
		221
		222	$pom
97	}	223	}
98		224
99	sub pod_to_pango($) {	225	sub pod_to_pango($) {
100	my ($pom) = @_;	226	my ($pom) = @_;
101		227
…		…
109	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	235	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
110	split /\n/, $pom->present ("CFClient::PodToPango")	236	split /\n/, $pom->present ("CFClient::PodToPango")
111	]	237	]
112	}	238	}
113		239
114	package CFClient::PodToPango;	240	package CFClient::Layout;
115		241
116	use base Pod::POM::View::Text;	242	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
117		243	clear_font_cache;
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	};	244	};
155		245
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;	246	package CFClient::Item;
		247
		248	use strict;
		249	use Crossfire::Protocol::Constants;
		250
		251	my $last_enter_count = 1;
194		252
195	sub desc_string {	253	sub desc_string {
196	my ($self) = @_;	254	my ($self) = @_;
197		255
198	my $desc =	256	my $desc =
199	$self->{nrof} < 2	257	$self->{nrof} < 2
200	? $self->{name}	258	? $self->{name}
201	: "$self->{nrof} × $self->{name_pl}";	259	: "$self->{nrof} × $self->{name_pl}";
202		260
203	$self->{flags} & Crossfire::Protocol::F_OPEN	261	$self->{flags} & F_OPEN
204	and $desc .= " (open)";	262	and $desc .= " (open)";
205	$self->{flags} & Crossfire::Protocol::F_APPLIED	263	$self->{flags} & F_APPLIED
206	and $desc .= " (applied)";	264	and $desc .= " (applied)";
207	$self->{flags} & Crossfire::Protocol::F_UNPAID	265	$self->{flags} & F_UNPAID
208	and $desc .= " (unpaid)";	266	and $desc .= " (unpaid)";
209	$self->{flags} & Crossfire::Protocol::F_MAGIC	267	$self->{flags} & F_MAGIC
210	and $desc .= " (magic)";	268	and $desc .= " (magic)";
211	$self->{flags} & Crossfire::Protocol::F_CURSED	269	$self->{flags} & F_CURSED
212	and $desc .= " (cursed)";	270	and $desc .= " (cursed)";
213	$self->{flags} & Crossfire::Protocol::F_DAMNED	271	$self->{flags} & F_DAMNED
214	and $desc .= " (damned)";	272	and $desc .= " (damned)";
215	$self->{flags} & Crossfire::Protocol::F_LOCKED	273	$self->{flags} & F_LOCKED
216	and $desc .= " *";	274	and $desc .= " *";
217		275
218	$desc	276	$desc
219	}	277	}
220		278
…		…
224	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	282	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
225		283
226	$weight < 0 ? "?" : $weight * 0.001	284	$weight < 0 ? "?" : $weight * 0.001
227	}	285	}
228		286
		287	sub do_n_dialog {
		288	my ($cb) = @_;
		289
		290	my $w = new CFClient::UI::FancyFrame;
		291	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
		292	$vb->add (new CFClient::UI::Label text => "Enter item count:");
		293	$vb->add (my $entry = new CFClient::UI::Entry
		294	text => $last_enter_count,
		295	on_activate => sub {
		296	my ($entry) = @_;
		297	$last_enter_count = $entry->get_text;
		298	$cb->($last_enter_count);
		299	$w->hide;
		300	$w = undef;
		301	}
		302	);
		303	$entry->grab_focus;
		304	$w->show;
		305
		306	}
		307
229	sub update_widgets {	308	sub update_widgets {
230	my ($self) = @_;	309	my ($self) = @_;
231		310
		311	# necessary to avoid cyclic references
		312	Scalar::Util::weaken $self;
		313
232	my $button_cb = sub {	314	my $button_cb = sub {
233	my (undef, $ev, $x, $y) = @_;	315	my (undef, $ev, $x, $y) = @_;
234		316
		317	my $targ = $::CONN->{player}{tag};
		318
		319	if ($self->{container} == $::CONN->{player}{tag}) {
		320	$targ = $::CONN->{open_container};
		321	}
		322
235	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	323	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
236	my $targ = $::CONN->{player}{tag};
237
238	if ($self->{container} == $::CONN->{player}{tag}) {
239	$targ = $::CONN->{open_container};
240	}
241
242	$::CONN->send ("move $targ $self->{tag} 0");	324	$::CONN->send ("move $targ $self->{tag} 0")
		325	if $targ \|\| !($self->{flags} & F_LOCKED);
		326	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		327	$self->{flags} & F_LOCKED
		328	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		329	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
243	} elsif ($ev->{button} == 1) {	330	} elsif ($ev->{button} == 1) {
244	$::CONN->send ("examine $self->{tag}");	331	$::CONN->send ("examine $self->{tag}");
245	} elsif ($ev->{button} == 2) {	332	} elsif ($ev->{button} == 2) {
246	$::CONN->send ("apply $self->{tag}");	333	$::CONN->send ("apply $self->{tag}");
247	} elsif ($ev->{button} == 3) {	334	} elsif ($ev->{button} == 3) {
248	my @menu_items = (	335	my @menu_items = (
249	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	336	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
250	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	337	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
251	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	338	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
252	(	339	(
253	$self->{flags} & Crossfire::Protocol::F_LOCKED	340	$self->{flags} & F_LOCKED
254	? (	341	? (
255	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	342	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
256	)	343	)
257	: (	344	: (
258	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	345	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
259	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	346	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		347	["move n",
		348	sub {
		349	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		350	}
		351	]
260	)	352	)
261	),	353	),
262	);	354	);
263		355
264	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
269		361
270	my $tooltip_std = "<small>"	362	my $tooltip_std = "<small>"
271	. "Left click - examine item\n"	363	. "Left click - examine item\n"
272	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	364	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
273	. "Middle click - apply\n"	365	. "Middle click - apply\n"
		366	. "Shift-Middle click - lock/unlock\n"
274	. "Right click - further options"	367	. "Right click - further options"
275	. "</small>\n";	368	. "</small>\n";
276		369
277	$self->{face_widget} \|\|= new CFClient::UI::Face	370	$self->{face_widget} \|\|= new CFClient::UI::Face
278	can_events => 1,	371	can_events => 1,
279	can_hover => 1,	372	can_hover => 1,
280	anim => $self->{anim},	373	anim => $self->{anim},
281	animspeed => $self->{animspeed}, # TODO# must be set at creation time	374	animspeed => $self->{animspeed}, # TODO# must be set at creation time
282	connect_button_down => $button_cb,	375	on_button_down => $button_cb,
283	;	376	;
284	$self->{face_widget}{face} = $self->{face};	377	$self->{face_widget}{face} = $self->{face};
285	$self->{face_widget}{anim} = $self->{anim};	378	$self->{face_widget}{anim} = $self->{anim};
286	$self->{face_widget}{animspeed} = $self->{animspeed};	379	$self->{face_widget}{animspeed} = $self->{animspeed};
287	$self->{face_widget}->set_tooltip (	380	$self->{face_widget}->set_tooltip (
…		…
294	$self->{desc_widget} \|\|= new CFClient::UI::Label	387	$self->{desc_widget} \|\|= new CFClient::UI::Label
295	can_events => 1,	388	can_events => 1,
296	can_hover => 1,	389	can_hover => 1,
297	ellipsise => 2,	390	ellipsise => 2,
298	align => -1,	391	align => -1,
299	connect_button_down => $button_cb,	392	on_button_down => $button_cb,
300	;	393	;
301	my $desc = CFClient::Item::desc_string $self;	394	my $desc = CFClient::Item::desc_string $self;
302	$self->{desc_widget}->set_text ($desc);	395	$self->{desc_widget}->set_text ($desc);
303	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");	396	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
304		397
305	$self->{weight_widget} \|\|= new CFClient::UI::Label	398	$self->{weight_widget} \|\|= new CFClient::UI::Label
306	can_events => 1,	399	can_events => 1,
307	can_hover => 1,	400	can_hover => 1,
308	ellipsise => 0,	401	ellipsise => 0,
309	align => 0,	402	align => 0,
310	connect_button_down => $button_cb,	403	on_button_down => $button_cb,
311	;	404	;
312	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);	405	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
313		406
314	$self->{weight_widget}->set_tooltip (	407	$self->{weight_widget}->set_tooltip (
315	"<b>Weight</b>.\n"	408	"<b>Weight</b>.\n"

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.97 by root, Tue Jul 4 23:23:31 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.97 by root, Tue Jul 4 23:23:31 2006 UTC