ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.102 by root, Sat Jul 22 13:20:33 2006 UTC vs.
Revision 1.132 by root, Wed Dec 6 00:04:13 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFClient - undocumented utility garbage for our crossfire client 3CFPlus - 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
15package CFClient; 15package CFPlus;
16
17use Carp ();
16 18
17BEGIN { 19BEGIN {
18 $VERSION = '0.1'; 20 $VERSION = '0.97';
19 21
20 use XSLoader; 22 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
22} 24}
23 25
24use utf8; 26use utf8;
25 27
26use Carp ();
27use AnyEvent (); 28use AnyEvent ();
28use BerkeleyDB; 29use BerkeleyDB;
29use Pod::POM (); 30use Pod::POM ();
30use Scalar::Util (); 31use Scalar::Util ();
31use Storable (); # finally 32use Storable (); # finally
32 33
33our %STAT_TOOLTIP = ( 34BEGIN {
34 Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack", 35 use Crossfire::Protocol::Base ();
35 Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed", 36 *to_json = \&Crossfire::Protocol::Base::to_json;
36 Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have", 37 *from_json = \&Crossfire::Protocol::Base::from_json;
37 Int => "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have",
38 Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
39 Pow => "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up",
40 Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
41
42 Wc => "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72.",
43 Ac => "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases.",
44 Dam => "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.",
45 Arm => "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance.",
46 Spd => "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed.",
47 WSp => "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed.",
48);
49
50package CFClient::PodToPango;
51
52use base Pod::POM::View::Text;
53
54our $VERSION = 1; # bump if resultant formatting changes
55
56our $indent = 0;
57
58*view_seq_code =
59*view_seq_bold = sub { "<b>$_[1]</b>" };
60*view_seq_italic = sub { "<i>$_[1]</i>" };
61*view_seq_space =
62*view_seq_link =
63*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
64
65sub view_seq_text {
66 my $text = $_[1];
67 $text =~ s/\s+/ /g;
68 CFClient::UI::Label::escape ($text)
69} 38}
70 39
71sub view_item { 40=item guard { BLOCK }
72 ("\t" x ($indent / 4))
73 . $_[1]->title->present ($_[0])
74 . "\n\n"
75 . $_[1]->content->present ($_[0])
76}
77 41
78sub view_verbatim { 42Returns an object that executes the given block as soon as it is destroyed.
79 (join "",
80 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
81 split /\n/, CFClient::UI::Label::escape ($_[1]))
82 . "\n"
83}
84 43
85sub view_textblock { 44=cut
86 ("\t" x ($indent / 2)) . "$_[1]\n\n"
87}
88 45
89sub view_head1 { 46sub guard(&) {
90 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 47 bless \(my $cb = $_[0]), "CFPlus::Guard"
91 . $_[1]->content->present ($_[0])
92};
93
94sub view_head2 {
95 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
96 . $_[1]->content->present ($_[0])
97};
98
99sub view_head3 {
100 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
101 . $_[1]->content->present ($_[0])
102};
103
104sub view_over {
105 local $indent = $indent + $_[1]->indent;
106 $_[1]->content->present ($_[0])
107} 48}
108 49
50sub CFPlus::Guard::DESTROY {
51 ${$_[0]}->()
52}
53
54sub asxml($) {
55 local $_ = $_[0];
56
57 s/&/&amp;/g;
58 s/>/&gt;/g;
59 s/</&lt;/g;
60
61 $_
62}
63
64sub socketpipe() {
65 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
66 or die "cannot establish bidiretcional pipe: $!\n";
67
68 ($fh1, $fh2)
69}
70
71sub background(&;&) {
72 my ($bg, $cb) = @_;
73
74 my ($fh_r, $fh_w) = CFPlus::socketpipe;
75
76 my $pid = fork;
77
78 if (defined $pid && !$pid) {
79 local $SIG{__DIE__};
80
81 open STDOUT, ">&", $fh_w;
82 open STDERR, ">&", $fh_w;
83 close $fh_r;
84 close $fh_w;
85
86 $| = 1;
87
88 eval { $bg->() };
89
90 if ($@) {
91 my $msg = $@;
92 $msg =~ s/\n+/\n/;
93 warn "FATAL: $msg";
94 CFPlus::_exit 1;
95 }
96
97 # win32 is fucked up, of course. exit will clean stuff up,
98 # which destroys our database etc. _exit will exit ALL
99 # forked processes, because of the dreaded fork emulation.
100 CFPlus::_exit 0;
101 }
102
103 close $fh_w;
104
105 my $buffer;
106
107 my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
108 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
109 undef $w;
110 $cb->();
111 return;
112 }
113
114 while ($buffer =~ s/^(.*)\n//) {
115 my $line = $1;
116 $line =~ s/\s+$//;
117 utf8::decode $line;
118 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
119 $cb->(from_json $1);
120 } else {
121 ::message ({
122 markup => "background($pid): " . CFPlus::asxml $line,
123 });
124 }
125 }
126 });
127}
128
129sub background_msg {
130 my ($msg) = @_;
131
132 $msg = "\x{e877}json_msg " . to_json $msg;
133 $msg =~ s/\n//g;
134 utf8::encode $msg;
135 print $msg, "\n";
136}
137
109package CFClient::Database; 138package CFPlus::Database;
110 139
111our @ISA = BerkeleyDB::Btree::; 140our @ISA = BerkeleyDB::Btree::;
112 141
113sub get($$) { 142sub get($$) {
114 my $data; 143 my $data;
… …
121my %DB_SYNC; 150my %DB_SYNC;
122 151
123sub put($$$) { 152sub put($$$) {
124 my ($db, $key, $data) = @_; 153 my ($db, $key, $data) = @_;
125 154
155 my $hkey = $db + 0;
156 Scalar::Util::weaken $db;
126 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 157 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
158 delete $DB_SYNC{$hkey};
159 $db->db_sync if $db;
160 });
127 161
128 $db->db_put ($key => $data) 162 $db->db_put ($key => $data)
129} 163}
130 164
131package CFClient; 165package CFPlus;
132 166
133sub find_rcfile($) { 167sub find_rcfile($) {
134 my $path; 168 my $path;
135 169
136 for (grep !ref, @INC) { 170 for (grep !ref, @INC) {
137 $path = "$_/CFClient/resources/$_[0]"; 171 $path = "$_/CFPlus/resources/$_[0]";
138 return $path if -r $path; 172 return $path if -r $path;
139 } 173 }
140 174
141 die "FATAL: can't find required file $_[0]\n"; 175 die "FATAL: can't find required file $_[0]\n";
142} 176}
143 177
144sub read_cfg { 178sub read_cfg {
145 my ($file) = @_; 179 my ($file) = @_;
146 180
147 open CFG, $file 181 open my $fh, $file
148 or return; 182 or return;
149 183
150 my $CFG;
151
152 local $/; 184 local $/;
153 $CFG = eval <CFG>; 185 my $CFG = <$fh>;
154 186
155 $::CFG = $CFG; 187 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
156 188 require YAML;
157 close CFG; 189 utf8::decode $CFG;
190 $::CFG = YAML::Load ($CFG);
191 } elsif ($CFG =~ /^\{/) {
192 $::CFG = from_json $CFG;
193 } else {
194 $::CFG = eval $CFG; ## todo comaptibility cruft
195 }
158} 196}
159 197
160sub write_cfg { 198sub write_cfg {
161 my ($file) = @_; 199 my ($file) = @_;
162 200
163 open CFG, ">$file" 201 $::CFG->{VERSION} = $::VERSION;
202
203 open my $fh, ">:utf8", $file
164 or return; 204 or return;
205 print $fh to_json $::CFG;
206}
165 207
166 { 208sub http_proxy {
167 require Data::Dumper; 209 my @proxy = win32_proxy_info;
168 local $Data::Dumper::Purity = 1; 210
169 $::CFG->{VERSION} = $::VERSION; 211 if (@proxy) {
170 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); 212 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
213 } elsif (exists $ENV{http_proxy}) {
214 $ENV{http_proxy}
215 } else {
216 ()
171 } 217 }
218}
172 219
173 close CFG; 220sub set_proxy {
221 my $proxy = http_proxy
222 or return;
223
224 $ENV{http_proxy} = $proxy;
225}
226
227sub lwp_useragent {
228 require LWP::UserAgent;
229
230 CFPlus::set_proxy;
231
232 my $ua = LWP::UserAgent->new (
233 agent => "cfplus $VERSION",
234 keep_alive => 1,
235 env_proxy => 1,
236 timeout => 30,
237 );
238}
239
240sub lwp_check($) {
241 my ($res) = @_;
242
243 $res->is_error
244 and die $res->status_line;
245
246 $res
174} 247}
175 248
176our $DB_ENV; 249our $DB_ENV;
177 250our $DB_STATE;
178{
179 use strict;
180
181 mkdir "$Crossfire::VARDIR/cfplus", 0777;
182 my $recover = $BerkeleyDB::db_version >= 4.4
183 ? eval "DB_REGISTER | DB_RECOVER"
184 : 0;
185
186 $DB_ENV = new BerkeleyDB::Env
187 -Home => "$Crossfire::VARDIR/cfplus",
188 -Cachesize => 1_000_000,
189 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
190# -ErrPrefix => "DATABASE",
191 -Verbose => 1,
192 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
193 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
194 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
195}
196 251
197sub db_table($) { 252sub db_table($) {
198 my ($table) = @_; 253 my ($table) = @_;
199 254
200 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 255 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
201 256
202 new CFClient::Database 257 new CFPlus::Database
203 -Env => $DB_ENV, 258 -Env => $DB_ENV,
204 -Filename => $table, 259 -Filename => $table,
205# -Filename => "database", 260# -Filename => "database",
206# -Subname => $table, 261# -Subname => $table,
207 -Property => DB_CHKSUM, 262 -Property => DB_CHKSUM,
208 -Flags => DB_CREATE | DB_UPGRADE, 263 -Flags => DB_CREATE | DB_UPGRADE,
209 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 264 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
210} 265}
211 266
212my $pod_cache = db_table "pod_cache"; 267{
268 use strict;
213 269
214sub load_pod($$$$) { 270 my $HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version";
215 my ($path, $filtertype, $filterversion, $filtercb) = @_;
216 271
217 stat $path 272 mkdir $HOME, 0777;
218 or die "$path: $!"; 273 my $recover = $BerkeleyDB::db_version >= 4.4
274 ? eval "DB_REGISTER | DB_RECOVER"
275 : 0;
219 276
220 my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9]; 277 $DB_ENV = new BerkeleyDB::Env
278 -Home => $HOME,
279 -Cachesize => 1_000_000,
280 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
281# -ErrPrefix => "DATABASE",
282 -Verbose => 1,
283 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
284 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
285 or die "unable to create/open database home $HOME: $BerkeleyDB::Error";
221 286
222 my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } }; 287 $DB_STATE = db_table "state";
223
224 return $pom if $chash eq $phash;
225
226 my $pod = do {
227 local $/;
228 open my $pod, "<:utf8", $_[0]
229 or die "$_[0]: $!";
230 <$pod>
231 };
232
233 #utf8::downgrade $pod;
234
235 $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
236
237 $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
238
239 $pom
240} 288}
241 289
242sub pod_to_pango($) {
243 my ($pom) = @_;
244
245 $pom->present ("CFClient::PodToPango")
246}
247
248sub pod_to_pango_list($) {
249 my ($pom) = @_;
250
251 [
252 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
253 split /\n/, $pom->present ("CFClient::PodToPango")
254 ]
255}
256
257package CFClient::Layout; 290package CFPlus::Layout;
258 291
259$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 292$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
260 reset_glyph_cache; 293 reset_glyph_cache;
261}; 294};
262 295
263package CFClient::Item; 296package CFPlus::Item;
264 297
265use strict; 298use strict;
266use Crossfire::Protocol::Constants; 299use Crossfire::Protocol::Constants;
267 300
268my $last_enter_count = 1; 301my $last_enter_count = 1;
… …
302} 335}
303 336
304sub do_n_dialog { 337sub do_n_dialog {
305 my ($cb) = @_; 338 my ($cb) = @_;
306 339
307 my $w = new CFClient::UI::FancyFrame 340 my $w = new CFPlus::UI::Toplevel
308 on_delete => sub { $_[0]->destroy; 1 }, 341 on_delete => sub { $_[0]->destroy; 1 },
309 has_close_button => 1, 342 has_close_button => 1,
310 ; 343 ;
311 344
312 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); 345 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
313 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 346 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
314 $vb->add (my $entry = new CFClient::UI::Entry 347 $vb->add (my $entry = new CFPlus::UI::Entry
315 text => $last_enter_count, 348 text => $last_enter_count,
316 on_activate => sub { 349 on_activate => sub {
317 my ($entry) = @_; 350 my ($entry) = @_;
318 $last_enter_count = $entry->get_text; 351 $last_enter_count = $entry->get_text;
319 $cb->($last_enter_count); 352 $cb->($last_enter_count);
… …
341 374
342 if ($self->{container} == $::CONN->{player}{tag}) { 375 if ($self->{container} == $::CONN->{player}{tag}) {
343 $targ = $::CONN->{open_container}; 376 $targ = $::CONN->{open_container};
344 } 377 }
345 378
346 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 379 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
347 $::CONN->send ("move $targ $self->{tag} 0") 380 $::CONN->send ("move $targ $self->{tag} 0")
348 if $targ || !($self->{flags} & F_LOCKED); 381 if $targ || !($self->{flags} & F_LOCKED);
349 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 382 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
350 $self->{flags} & F_LOCKED 383 $self->{flags} & F_LOCKED
351 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 384 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
352 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 385 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
353 } elsif ($ev->{button} == 1) { 386 } elsif ($ev->{button} == 1) {
354 $::CONN->send ("examine $self->{tag}"); 387 $::CONN->send ("examine $self->{tag}");
… …
367 sub { 400 sub {
368 $::CONN->send ("mark ". pack "N", $self->{tag}); 401 $::CONN->send ("mark ". pack "N", $self->{tag});
369 $::CONN->send ("command apply flint and steel"); 402 $::CONN->send ("command apply flint and steel");
370 } 403 }
371 ], 404 ],
405 ["inscribe", # first try of an easier use of flint&steel
406 sub {
407 &::open_string_query ("Text to inscribe", sub {
408 my ($entry, $txt) = @_;
409 $::CONN->send ("mark ". pack "N", $self->{tag});
410 $::CONN->send ("command use_skill inscription $txt");
411 });
412 }
413 ],
414 ["rename", # first try of an easier use of flint&steel
415 sub {
416 &::open_string_query ("Rename item to:", sub {
417 my ($entry, $txt) = @_;
418 $::CONN->send ("mark ". pack "N", $self->{tag});
419 $::CONN->send ("command rename to <$txt>");
420 }, $self->{name},
421 "If you input no name or erase the current custom name, the custom name will be unset");
422 }
423 ],
372 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 424 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
373 ( 425 (
374 $self->{flags} & F_LOCKED 426 $self->{flags} & F_LOCKED
375 ? ( 427 ? (
376 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 428 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
377 ) 429 )
378 : ( 430 : (
379 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 431 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
380 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }], 432 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
381 ["$move_prefix n", 433 ["$move_prefix &lt;n&gt;",
382 sub { 434 sub {
383 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) 435 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
384 } 436 }
385 ] 437 ]
386 ) 438 )
387 ), 439 ),
440 ["bind <i>apply $self->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["apply $self->{name}"]) }],
388 ); 441 );
389 442
390 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 443 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
391 } 444 }
392 445
393 1 446 1
394 }; 447 };
395 448
… …
399 . "Middle click - apply\n" 452 . "Middle click - apply\n"
400 . "Shift-Middle click - lock/unlock\n" 453 . "Shift-Middle click - lock/unlock\n"
401 . "Right click - further options" 454 . "Right click - further options"
402 . "</small>\n"; 455 . "</small>\n";
403 456
457 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
458 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
459 : undef;
460
404 $self->{face_widget} ||= new CFClient::UI::Face 461 $self->{face_widget} ||= new CFPlus::UI::Face
405 can_events => 1, 462 can_events => 1,
406 can_hover => 1, 463 can_hover => 1,
407 anim => $self->{anim}, 464 anim => $self->{anim},
408 animspeed => $self->{animspeed}, # TODO# must be set at creation time 465 animspeed => $self->{animspeed}, # TODO# must be set at creation time
409 on_button_down => $button_cb, 466 on_button_down => $button_cb,
410 ; 467 ;
468 $self->{face_widget}{bg} = $bg;
411 $self->{face_widget}{face} = $self->{face}; 469 $self->{face_widget}{face} = $self->{face};
412 $self->{face_widget}{anim} = $self->{anim}; 470 $self->{face_widget}{anim} = $self->{anim};
413 $self->{face_widget}{animspeed} = $self->{animspeed}; 471 $self->{face_widget}{animspeed} = $self->{animspeed};
414 $self->{face_widget}->set_tooltip ( 472 $self->{face_widget}->set_tooltip (
415 "<b>Face/Animation.</b>\n" 473 "<b>Face/Animation.</b>\n"
416 . "Item uses face #$self->{face}. " 474 . "Item uses face #$self->{face}. "
417 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 475 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
418 . "\n\n$tooltip_std" 476 . "\n\n$tooltip_std"
419 ); 477 );
420 478
421 $self->{desc_widget} ||= new CFClient::UI::Label 479 $self->{desc_widget} ||= new CFPlus::UI::Label
422 can_events => 1, 480 can_events => 1,
423 can_hover => 1, 481 can_hover => 1,
424 ellipsise => 2, 482 ellipsise => 2,
425 align => -1, 483 align => -1,
426 on_button_down => $button_cb, 484 on_button_down => $button_cb,
427 ; 485 ;
428 my $desc = CFClient::Item::desc_string $self; 486 my $desc = CFPlus::Item::desc_string $self;
487 $self->{desc_widget}{bg} = $bg;
429 $self->{desc_widget}->set_text ($desc); 488 $self->{desc_widget}->set_text ($desc);
430 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 489 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
431 490
432 $self->{weight_widget} ||= new CFClient::UI::Label 491 $self->{weight_widget} ||= new CFPlus::UI::Label
433 can_events => 1, 492 can_events => 1,
434 can_hover => 1, 493 can_hover => 1,
435 ellipsise => 0, 494 ellipsise => 0,
436 align => 0, 495 align => 0,
437 on_button_down => $button_cb, 496 on_button_down => $button_cb,
438 ; 497 ;
498 $self->{weight_widget}{bg} = $bg;
439 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 499 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
440
441 $self->{weight_widget}->set_tooltip ( 500 $self->{weight_widget}->set_tooltip (
442 "<b>Weight</b>.\n" 501 "<b>Weight</b>.\n"
443 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 502 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
444 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 503 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
445 . "\n\n$tooltip_std" 504 . "\n\n$tooltip_std"

Diff Legend

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