[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.124 by root, Wed Oct 11 23:34:24 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
		17	use Carp ();
16		18
17	BEGIN {	19	BEGIN {
18	$VERSION = '0.1';	20	$VERSION = '0.52';
19		21
20	use XSLoader;	22	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	23	XSLoader::load "CFPlus", $VERSION;
		24	}
		25
		26	BEGIN {
		27	$SIG{__DIE__} = sub {
		28	return if CFPlus::in_destruct;
		29	#CFPlus::fatal $_[0];#d#
		30	CFPlus::error Carp::longmess $_[0];#d#
		31	die;#d#
		32	};
22	}	33	}
23		34
24	use utf8;	35	use utf8;
25		36
26	use Carp ();
27	use AnyEvent ();	37	use AnyEvent ();
28	use BerkeleyDB;	38	use BerkeleyDB;
		39	use Pod::POM ();
		40	use Scalar::Util ();
		41	use Storable (); # finally
		42
		43	=item guard { BLOCK }
		44
		45	Returns an object that executes the given block as soon as it is destroyed.
		46
		47	=cut
		48
		49	sub guard(&) {
		50	bless \(my $cb = $_[0]), "CFPlus::Guard"
		51	}
		52
		53	sub CFPlus::Guard::DESTROY {
		54	${$_[0]}->()
		55	}
		56
		57	sub asxml($) {
		58	local $_ = $_[0];
		59
		60	s/&/&/g;
		61	s/>/>/g;
		62	s/</</g;
		63
		64	$_
		65	}
		66
		67	sub socketpipe() {
		68	socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		69	or die "cannot establish bidiretcional pipe: $!\n";
		70
		71	($fh1, $fh2)
		72	}
		73
		74	sub background(&) {
		75	my ($cb) = @_;
		76
		77	my ($fh_r, $fh_w) = CFPlus::socketpipe;
		78
		79	my $pid = fork;
		80
		81	if (defined $pid && !$pid) {
		82	local $SIG{__DIE__};
		83
		84	open STDOUT, ">&", $fh_w;
		85	open STDERR, ">&", $fh_w;
		86	close $fh_r;
		87	close $fh_w;
		88
		89	$\| = 1;
		90
		91	eval { $cb->() };
		92
		93	if ($@) {
		94	my $msg = $@;
		95	$msg =~ s/\n+/\n/;
		96	warn "FATAL: $msg";
		97	CFPlus::_exit 1;
		98	}
		99
		100	# win32 is fucked up, of course. exit will clean stuff up,
		101	# which destroys our database etc. _exit will exit ALL
		102	# forked processes, because of the dreaded fork emulation.
		103	CFPlus::_exit 0;
		104	}
		105
		106	close $fh_w;
		107
		108	my $buffer;
		109
		110	Event->io (fd => $fh_r, poll => 'r', cb => sub {
		111	unless (sysread $fh_r, $buffer, 4096, length $buffer) {
		112	$_[0]->w->cancel;
		113	$buffer .= "done\n";
		114	}
		115
		116	while ($buffer =~ s/^(.*)\n//) {
		117	my $line = $1;
		118	$line =~ s/\s+$//;
		119	utf8::decode $line;
		120	::message ({
		121	markup => "editor($pid): " . CFPlus::asxml $line,
		122	});
		123	}
		124	});
		125	}
		126
		127	package CFPlus::Database;
		128
		129	our @ISA = BerkeleyDB::Btree::;
		130
		131	sub get($$) {
		132	my $data;
		133
		134	$_[0]->db_get ($_[1], $data) == 0
		135	? $data
		136	: ()
		137	}
		138
		139	my %DB_SYNC;
		140
		141	sub put($$$) {
		142	my ($db, $key, $data) = @_;
		143
		144	my $hkey = $db + 0;
		145	Scalar::Util::weaken $db;
		146	$DB_SYNC{$hkey} \|\|= AnyEvent->timer (after => 5, cb => sub {
		147	delete $DB_SYNC{$hkey};
		148	$db->db_sync if $db;
		149	});
		150
		151	$db->db_put ($key => $data)
		152	}
		153
		154	package CFPlus;
29		155
30	sub find_rcfile($) {	156	sub find_rcfile($) {
31	my $path;	157	my $path;
32		158
33	for (grep !ref, @INC) {	159	for (grep !ref, @INC) {
34	$path = "$_/CFClient/resources/$_[0]";	160	$path = "$_/CFPlus/resources/$_[0]";
35	return $path if -r $path;	161	return $path if -r $path;
36	}	162	}
37		163
38	die "FATAL: can't find required file $_[0]\n";	164	die "FATAL: can't find required file $_[0]\n";
39	}	165	}
40		166
		167	BEGIN {
		168	use Crossfire::Protocol::Base ();
		169	*to_json = \&Crossfire::Protocol::Base::to_json;
		170	*from_json = \&Crossfire::Protocol::Base::from_json;
		171	}
		172
41	sub read_cfg {	173	sub read_cfg {
42	my ($file) = @_;	174	my ($file) = @_;
43		175
44	open CFG, $file	176	open my $fh, $file
45	or return;	177	or return;
46		178
47	my $CFG;
48
49	local $/;	179	local $/;
50	$CFG = eval <CFG>;	180	my $CFG = <$fh>;
51		181
52	$::CFG = $CFG;	182	if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
53		183	require YAML;
54	close CFG;	184	utf8::decode $CFG;
		185	$::CFG = YAML::Load ($CFG);
		186	} elsif ($CFG =~ /^\{/) {
		187	$::CFG = from_json $CFG;
		188	} else {
		189	$::CFG = eval $CFG; ## todo comaptibility cruft
		190	}
55	}	191	}
56		192
57	sub write_cfg {	193	sub write_cfg {
58	my ($file) = @_;	194	my ($file) = @_;
59		195
60	open CFG, ">$file"	196	$::CFG->{VERSION} = $::VERSION;
		197
		198	open my $fh, ">:utf8", $file
61	or return;	199	or return;
		200	print $fh to_json $::CFG;
		201	}
62		202
63	{	203	sub http_proxy {
64	require Data::Dumper;	204	my @proxy = win32_proxy_info;
65	local $Data::Dumper::Purity = 1;	205
66	$::CFG->{VERSION} = $::VERSION;	206	if (@proxy) {
67	print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);	207	"http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
		208	} elsif (exists $ENV{http_proxy}) {
		209	$ENV{http_proxy}
		210	} else {
		211	()
68	}	212	}
69
70	close CFG;
71	}	213	}
72		214
73	mkdir "$Crossfire::VARDIR/pclient", 0777;	215	sub set_proxy {
		216	my $proxy = http_proxy
		217	or return;
74		218
75	our $DB_ENV = new BerkeleyDB::Env	219	$ENV{http_proxy} = $proxy;
76	-Home => "$Crossfire::VARDIR/pclient",	220	}
77	-Cachesize => 1_000_000,	221
78	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	222	our $DB_ENV;
79	# -ErrPrefix => "DATABASE",	223	our $DB_STATE;
80	-Verbose => 1,
81	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,
82	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
83		224
84	sub db_table($) {	225	sub db_table($) {
85	my ($table) = @_;	226	my ($table) = @_;
86		227
87	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	228	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
88		229
89	new CFClient::Database	230	new CFPlus::Database
90	-Env => $DB_ENV,	231	-Env => $DB_ENV,
91	-Filename => $table,	232	-Filename => $table,
92	# -Filename => "database",	233	# -Filename => "database",
93	# -Subname => $table,	234	# -Subname => $table,
94	-Property => DB_CHKSUM,	235	-Property => DB_CHKSUM,
95	-Flags => DB_CREATE \| DB_UPGRADE,	236	-Flags => DB_CREATE \| DB_UPGRADE,
96	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	237	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
97	}	238	}
98		239
99	sub pod_to_pango($) {	240	{
100	my ($pom) = @_;	241	use strict;
101		242
102	$pom->present ("CFClient::PodToPango")	243	mkdir "$Crossfire::VARDIR/cfplus", 0777;
103	}	244	my $recover = $BerkeleyDB::db_version >= 4.4
		245	? eval "DB_REGISTER \| DB_RECOVER"
		246	: 0;
104		247
105	sub pod_to_pango_list($) {	248	$DB_ENV = new BerkeleyDB::Env
106	my ($pom) = @_;	249	-Home => "$Crossfire::VARDIR/cfplus",
		250	-Cachesize => 1_000_000,
		251	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
		252	# -ErrPrefix => "DATABASE",
		253	-Verbose => 1,
		254	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		255	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
		256	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
107		257
108	[	258	$DB_STATE = db_table "state";
109	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
110	split /\n/, $pom->present ("CFClient::PodToPango")
111	]
112	}	259	}
113		260
114	package CFClient::PodToPango;	261	package CFPlus::Layout;
115		262
116	use base Pod::POM::View::Text;	263	$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
117		264	reset_glyph_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	};	265	};
155		266
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;	267	package CFPlus::Item;
		268
		269	use strict;
		270	use Crossfire::Protocol::Constants;
		271
		272	my $last_enter_count = 1;
194		273
195	sub desc_string {	274	sub desc_string {
196	my ($self) = @_;	275	my ($self) = @_;
197		276
198	my $desc =	277	my $desc =
199	$self->{nrof} < 2	278	$self->{nrof} < 2
200	? $self->{name}	279	? $self->{name}
201	: "$self->{nrof} × $self->{name_pl}";	280	: "$self->{nrof} × $self->{name_pl}";
202		281
203	$self->{flags} & Crossfire::Protocol::F_OPEN	282	$self->{flags} & F_OPEN
204	and $desc .= " (open)";	283	and $desc .= " (open)";
205	$self->{flags} & Crossfire::Protocol::F_APPLIED	284	$self->{flags} & F_APPLIED
206	and $desc .= " (applied)";	285	and $desc .= " (applied)";
207	$self->{flags} & Crossfire::Protocol::F_UNPAID	286	$self->{flags} & F_UNPAID
208	and $desc .= " (unpaid)";	287	and $desc .= " (unpaid)";
209	$self->{flags} & Crossfire::Protocol::F_MAGIC	288	$self->{flags} & F_MAGIC
210	and $desc .= " (magic)";	289	and $desc .= " (magic)";
211	$self->{flags} & Crossfire::Protocol::F_CURSED	290	$self->{flags} & F_CURSED
212	and $desc .= " (cursed)";	291	and $desc .= " (cursed)";
213	$self->{flags} & Crossfire::Protocol::F_DAMNED	292	$self->{flags} & F_DAMNED
214	and $desc .= " (damned)";	293	and $desc .= " (damned)";
215	$self->{flags} & Crossfire::Protocol::F_LOCKED	294	$self->{flags} & F_LOCKED
216	and $desc .= " *";	295	and $desc .= " *";
217		296
218	$desc	297	$desc
219	}	298	}
220		299
224	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	303	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
225		304
226	$weight < 0 ? "?" : $weight * 0.001	305	$weight < 0 ? "?" : $weight * 0.001
227	}	306	}
228		307
		308	sub do_n_dialog {
		309	my ($cb) = @_;
		310
		311	my $w = new CFPlus::UI::Toplevel
		312	on_delete => sub { $_[0]->destroy; 1 },
		313	has_close_button => 1,
		314	;
		315
		316	$w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
		317	$vb->add (new CFPlus::UI::Label text => "Enter item count:");
		318	$vb->add (my $entry = new CFPlus::UI::Entry
		319	text => $last_enter_count,
		320	on_activate => sub {
		321	my ($entry) = @_;
		322	$last_enter_count = $entry->get_text;
		323	$cb->($last_enter_count);
		324	$w->hide;
		325	$w->destroy;
		326
		327	0
		328	},
		329	on_escape => sub { $w->destroy; 1 },
		330	);
		331	$entry->grab_focus;
		332	$w->show;
		333	}
		334
229	sub update_widgets {	335	sub update_widgets {
230	my ($self) = @_;	336	my ($self) = @_;
231		337
		338	# necessary to avoid cyclic references
		339	Scalar::Util::weaken $self;
		340
232	my $button_cb = sub {	341	my $button_cb = sub {
233	my (undef, $ev, $x, $y) = @_;	342	my (undef, $ev, $x, $y) = @_;
234		343
235	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
236	my $targ = $::CONN->{player}{tag};	344	my $targ = $::CONN->{player}{tag};
237		345
238	if ($self->{container} == $::CONN->{player}{tag}) {	346	if ($self->{container} == $::CONN->{player}{tag}) {
239	$targ = $::CONN->{open_container};	347	$targ = $::CONN->{open_container};
240	}	348	}
241		349
		350	if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
242	$::CONN->send ("move $targ $self->{tag} 0");	351	$::CONN->send ("move $targ $self->{tag} 0")
		352	if $targ \|\| !($self->{flags} & F_LOCKED);
		353	} elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
		354	$self->{flags} & F_LOCKED
		355	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		356	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
243	} elsif ($ev->{button} == 1) {	357	} elsif ($ev->{button} == 1) {
244	$::CONN->send ("examine $self->{tag}");	358	$::CONN->send ("examine $self->{tag}");
245	} elsif ($ev->{button} == 2) {	359	} elsif ($ev->{button} == 2) {
246	$::CONN->send ("apply $self->{tag}");	360	$::CONN->send ("apply $self->{tag}");
247	} elsif ($ev->{button} == 3) {	361	} elsif ($ev->{button} == 3) {
		362	my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
		363	if ($self->{container} == $::CONN->{open_container}) {
		364	$move_prefix = "take";
		365	}
		366
248	my @menu_items = (	367	my @menu_items = (
249	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	368	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
250	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	369	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		370	["ignite/thaw", # first try of an easier use of flint&steel
		371	sub {
		372	$::CONN->send ("mark ". pack "N", $self->{tag});
		373	$::CONN->send ("command apply flint and steel");
		374	}
		375	],
		376	["inscribe", # first try of an easier use of flint&steel
		377	sub {
		378	&::open_string_query ("Text to inscribe", sub {
		379	my ($entry, $txt) = @_;
		380	$::CONN->send ("mark ". pack "N", $self->{tag});
		381	$::CONN->send ("command use_skill inscription $txt");
		382	});
		383	}
		384	],
		385	["rename", # first try of an easier use of flint&steel
		386	sub {
		387	&::open_string_query ("Rename item to:", sub {
		388	my ($entry, $txt) = @_;
		389	$::CONN->send ("mark ". pack "N", $self->{tag});
		390	$::CONN->send ("command rename to <$txt>");
		391	}, $self->{name},
		392	"If you input no name or erase the current custom name, the custom name will be unset");
		393	}
		394	],
251	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	395	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
252	(	396	(
253	$self->{flags} & Crossfire::Protocol::F_LOCKED	397	$self->{flags} & F_LOCKED
254	? (	398	? (
255	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	399	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
256	)	400	)
257	: (	401	: (
258	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	402	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
259	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	403	["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
		404	["$move_prefix <n>",
		405	sub {
		406	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		407	}
		408	]
260	)	409	)
261	),	410	),
262	);	411	);
263		412
264	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	413	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
265	}	414	}
266		415
267	1	416	1
268	};	417	};
269		418
270	my $tooltip_std = "<small>"	419	my $tooltip_std = "<small>"
271	. "Left click - examine item\n"	420	. "Left click - examine item\n"
272	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	421	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
273	. "Middle click - apply\n"	422	. "Middle click - apply\n"
		423	. "Shift-Middle click - lock/unlock\n"
274	. "Right click - further options"	424	. "Right click - further options"
275	. "</small>\n";	425	. "</small>\n";
276		426
		427	my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
		428	: $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
		429	: undef;
		430
277	$self->{face_widget} \|\|= new CFClient::UI::Face	431	$self->{face_widget} \|\|= new CFPlus::UI::Face
278	can_events => 1,	432	can_events => 1,
279	can_hover => 1,	433	can_hover => 1,
280	anim => $self->{anim},	434	anim => $self->{anim},
281	animspeed => $self->{animspeed}, # TODO# must be set at creation time	435	animspeed => $self->{animspeed}, # TODO# must be set at creation time
282	connect_button_down => $button_cb,	436	on_button_down => $button_cb,
283	;	437	;
		438	$self->{face_widget}{bg} = $bg;
284	$self->{face_widget}{face} = $self->{face};	439	$self->{face_widget}{face} = $self->{face};
285	$self->{face_widget}{anim} = $self->{anim};	440	$self->{face_widget}{anim} = $self->{anim};
286	$self->{face_widget}{animspeed} = $self->{animspeed};	441	$self->{face_widget}{animspeed} = $self->{animspeed};
287	$self->{face_widget}->set_tooltip (	442	$self->{face_widget}->set_tooltip (
288	"<b>Face/Animation.</b>\n"	443	"<b>Face/Animation.</b>\n"
289	. "Item uses face #$self->{face}. "	444	. "Item uses face #$self->{face}. "
290	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")	445	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
291	. "\n\n$tooltip_std"	446	. "\n\n$tooltip_std"
292	);	447	);
293		448
294	$self->{desc_widget} \|\|= new CFClient::UI::Label	449	$self->{desc_widget} \|\|= new CFPlus::UI::Label
295	can_events => 1,	450	can_events => 1,
296	can_hover => 1,	451	can_hover => 1,
297	ellipsise => 2,	452	ellipsise => 2,
298	align => -1,	453	align => -1,
299	connect_button_down => $button_cb,	454	on_button_down => $button_cb,
300	;	455	;
301	my $desc = CFClient::Item::desc_string $self;	456	my $desc = CFPlus::Item::desc_string $self;
		457	$self->{desc_widget}{bg} = $bg;
302	$self->{desc_widget}->set_text ($desc);	458	$self->{desc_widget}->set_text ($desc);
303	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");	459	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
304		460
305	$self->{weight_widget} \|\|= new CFClient::UI::Label	461	$self->{weight_widget} \|\|= new CFPlus::UI::Label
306	can_events => 1,	462	can_events => 1,
307	can_hover => 1,	463	can_hover => 1,
308	ellipsise => 0,	464	ellipsise => 0,
309	align => 0,	465	align => 0,
310	connect_button_down => $button_cb,	466	on_button_down => $button_cb,
311	;	467	;
		468	$self->{weight_widget}{bg} = $bg;
312	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);	469	$self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
313
314	$self->{weight_widget}->set_tooltip (	470	$self->{weight_widget}->set_tooltip (
315	"<b>Weight</b>.\n"	471	"<b>Weight</b>.\n"
316	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")	472	. ($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. ")	473	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
318	. "\n\n$tooltip_std"	474	. "\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.124 by root, Wed Oct 11 23:34:24 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.124 by root, Wed Oct 11 23:34:24 2006 UTC