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.103 by root, Sun Jul 23 08:58:43 2006 UTC vs.
Revision 1.131 by root, Tue Dec 5 00:52:56 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}
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 39
50=item guard { BLOCK } 40=item guard { BLOCK }
51 41
52Returns an object that executes the given block as soon as it is destroyed. 42Returns an object that executes the given block as soon as it is destroyed.
53 43
54=cut 44=cut
55 45
56sub guard(&) { 46sub guard(&) {
57 bless \(my $cb = $_[0]), "CFClient::Guard" 47 bless \(my $cb = $_[0]), "CFPlus::Guard"
58} 48}
59 49
60sub CFClient::Guard::DESTROY { 50sub CFPlus::Guard::DESTROY {
61 ${$_[0]}->() 51 ${$_[0]}->()
62} 52}
63 53
64package CFClient::PodToPango; 54sub asxml($) {
55 local $_ = $_[0];
65 56
66use base Pod::POM::View::Text; 57 s/&/&amp;/g;
58 s/>/&gt;/g;
59 s/</&lt;/g;
67 60
68our $VERSION = 1; # bump if resultant formatting changes 61 $_
69
70our $indent = 0;
71
72*view_seq_code =
73*view_seq_bold = sub { "<b>$_[1]</b>" };
74*view_seq_italic = sub { "<i>$_[1]</i>" };
75*view_seq_space =
76*view_seq_link =
77*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
78
79sub view_seq_text {
80 my $text = $_[1];
81 $text =~ s/\s+/ /g;
82 CFClient::UI::Label::escape ($text)
83} 62}
84 63
85sub view_item { 64sub socketpipe() {
86 ("\t" x ($indent / 4)) 65 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
87 . $_[1]->title->present ($_[0]) 66 or die "cannot establish bidiretcional pipe: $!\n";
88 . "\n\n"
89 . $_[1]->content->present ($_[0])
90}
91 67
92sub view_verbatim { 68 ($fh1, $fh2)
93 (join "",
94 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
95 split /\n/, CFClient::UI::Label::escape ($_[1]))
96 . "\n"
97} 69}
98 70
99sub view_textblock { 71sub background(&;&) {
100 ("\t" x ($indent / 2)) . "$_[1]\n\n" 72 my ($bg, $cb) = @_;
101}
102 73
103sub view_head1 { 74 my ($fh_r, $fh_w) = CFPlus::socketpipe;
104 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
105 . $_[1]->content->present ($_[0])
106};
107 75
108sub view_head2 { 76 my $pid = fork;
109 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
110 . $_[1]->content->present ($_[0])
111};
112 77
113sub view_head3 { 78 if (defined $pid && !$pid) {
114 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 79 local $SIG{__DIE__};
115 . $_[1]->content->present ($_[0])
116};
117 80
118sub view_over { 81 open STDOUT, ">&", $fh_w;
119 local $indent = $indent + $_[1]->indent; 82 open STDERR, ">&", $fh_w;
120 $_[1]->content->present ($_[0]) 83 close $fh_r;
121} 84 close $fh_w;
122 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
123package CFClient::Database; 138package CFPlus::Database;
124 139
125our @ISA = BerkeleyDB::Btree::; 140our @ISA = BerkeleyDB::Btree::;
126 141
127sub get($$) { 142sub get($$) {
128 my $data; 143 my $data;
… …
135my %DB_SYNC; 150my %DB_SYNC;
136 151
137sub put($$$) { 152sub put($$$) {
138 my ($db, $key, $data) = @_; 153 my ($db, $key, $data) = @_;
139 154
155 my $hkey = $db + 0;
156 Scalar::Util::weaken $db;
140 $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 });
141 161
142 $db->db_put ($key => $data) 162 $db->db_put ($key => $data)
143} 163}
144 164
145package CFClient; 165package CFPlus;
146 166
147sub find_rcfile($) { 167sub find_rcfile($) {
148 my $path; 168 my $path;
149 169
150 for (grep !ref, @INC) { 170 for (grep !ref, @INC) {
151 $path = "$_/CFClient/resources/$_[0]"; 171 $path = "$_/CFPlus/resources/$_[0]";
152 return $path if -r $path; 172 return $path if -r $path;
153 } 173 }
154 174
155 die "FATAL: can't find required file $_[0]\n"; 175 die "FATAL: can't find required file $_[0]\n";
156} 176}
157 177
158sub read_cfg { 178sub read_cfg {
159 my ($file) = @_; 179 my ($file) = @_;
160 180
161 open CFG, $file 181 open my $fh, $file
162 or return; 182 or return;
163 183
164 my $CFG;
165
166 local $/; 184 local $/;
167 $CFG = eval <CFG>; 185 my $CFG = <$fh>;
168 186
169 $::CFG = $CFG; 187 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
170 188 require YAML;
171 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 }
172} 196}
173 197
174sub write_cfg { 198sub write_cfg {
175 my ($file) = @_; 199 my ($file) = @_;
176 200
177 open CFG, ">$file" 201 $::CFG->{VERSION} = $::VERSION;
202
203 open my $fh, ">:utf8", $file
178 or return; 204 or return;
205 print $fh to_json $::CFG;
206}
179 207
180 { 208sub http_proxy {
181 require Data::Dumper; 209 my @proxy = win32_proxy_info;
182 local $Data::Dumper::Purity = 1; 210
183 $::CFG->{VERSION} = $::VERSION; 211 if (@proxy) {
184 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 ()
185 } 217 }
218}
186 219
187 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
188} 247}
189 248
190our $DB_ENV; 249our $DB_ENV;
191 250our $DB_STATE;
192{
193 use strict;
194
195 mkdir "$Crossfire::VARDIR/cfplus", 0777;
196 my $recover = $BerkeleyDB::db_version >= 4.4
197 ? eval "DB_REGISTER | DB_RECOVER"
198 : 0;
199
200 $DB_ENV = new BerkeleyDB::Env
201 -Home => "$Crossfire::VARDIR/cfplus",
202 -Cachesize => 1_000_000,
203 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
204# -ErrPrefix => "DATABASE",
205 -Verbose => 1,
206 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
207 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
208 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
209}
210 251
211sub db_table($) { 252sub db_table($) {
212 my ($table) = @_; 253 my ($table) = @_;
213 254
214 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 255 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
215 256
216 new CFClient::Database 257 new CFPlus::Database
217 -Env => $DB_ENV, 258 -Env => $DB_ENV,
218 -Filename => $table, 259 -Filename => $table,
219# -Filename => "database", 260# -Filename => "database",
220# -Subname => $table, 261# -Subname => $table,
221 -Property => DB_CHKSUM, 262 -Property => DB_CHKSUM,
222 -Flags => DB_CREATE | DB_UPGRADE, 263 -Flags => DB_CREATE | DB_UPGRADE,
223 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 264 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
224} 265}
225 266
226my $pod_cache = db_table "pod_cache"; 267{
268 use strict;
227 269
228sub load_pod($$$$) { 270 my $HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version";
229 my ($path, $filtertype, $filterversion, $filtercb) = @_;
230 271
231 stat $path 272 mkdir $HOME, 0777;
232 or die "$path: $!"; 273 my $recover = $BerkeleyDB::db_version >= 4.4
274 ? eval "DB_REGISTER | DB_RECOVER"
275 : 0;
233 276
234 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";
235 286
236 my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } }; 287 $DB_STATE = db_table "state";
237
238 return $pom if $chash eq $phash;
239
240 my $pod = do {
241 local $/;
242 open my $pod, "<:utf8", $_[0]
243 or die "$_[0]: $!";
244 <$pod>
245 };
246
247 #utf8::downgrade $pod;
248
249 $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
250
251 $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
252
253 $pom
254} 288}
255 289
256sub pod_to_pango($) {
257 my ($pom) = @_;
258
259 $pom->present ("CFClient::PodToPango")
260}
261
262sub pod_to_pango_list($) {
263 my ($pom) = @_;
264
265 [
266 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
267 split /\n/, $pom->present ("CFClient::PodToPango")
268 ]
269}
270
271package CFClient::Layout; 290package CFPlus::Layout;
272 291
273$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 292$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
274 reset_glyph_cache; 293 reset_glyph_cache;
275}; 294};
276 295
277package CFClient::Item; 296package CFPlus::Item;
278 297
279use strict; 298use strict;
280use Crossfire::Protocol::Constants; 299use Crossfire::Protocol::Constants;
281 300
282my $last_enter_count = 1; 301my $last_enter_count = 1;
… …
316} 335}
317 336
318sub do_n_dialog { 337sub do_n_dialog {
319 my ($cb) = @_; 338 my ($cb) = @_;
320 339
321 my $w = new CFClient::UI::FancyFrame 340 my $w = new CFPlus::UI::Toplevel
322 on_delete => sub { $_[0]->destroy; 1 }, 341 on_delete => sub { $_[0]->destroy; 1 },
323 has_close_button => 1, 342 has_close_button => 1,
324 ; 343 ;
325 344
326 $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");
327 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 346 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
328 $vb->add (my $entry = new CFClient::UI::Entry 347 $vb->add (my $entry = new CFPlus::UI::Entry
329 text => $last_enter_count, 348 text => $last_enter_count,
330 on_activate => sub { 349 on_activate => sub {
331 my ($entry) = @_; 350 my ($entry) = @_;
332 $last_enter_count = $entry->get_text; 351 $last_enter_count = $entry->get_text;
333 $cb->($last_enter_count); 352 $cb->($last_enter_count);
… …
355 374
356 if ($self->{container} == $::CONN->{player}{tag}) { 375 if ($self->{container} == $::CONN->{player}{tag}) {
357 $targ = $::CONN->{open_container}; 376 $targ = $::CONN->{open_container};
358 } 377 }
359 378
360 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 379 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
361 $::CONN->send ("move $targ $self->{tag} 0") 380 $::CONN->send ("move $targ $self->{tag} 0")
362 if $targ || !($self->{flags} & F_LOCKED); 381 if $targ || !($self->{flags} & F_LOCKED);
363 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 382 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
364 $self->{flags} & F_LOCKED 383 $self->{flags} & F_LOCKED
365 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 384 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
366 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 385 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
367 } elsif ($ev->{button} == 1) { 386 } elsif ($ev->{button} == 1) {
368 $::CONN->send ("examine $self->{tag}"); 387 $::CONN->send ("examine $self->{tag}");
… …
381 sub { 400 sub {
382 $::CONN->send ("mark ". pack "N", $self->{tag}); 401 $::CONN->send ("mark ". pack "N", $self->{tag});
383 $::CONN->send ("command apply flint and steel"); 402 $::CONN->send ("command apply flint and steel");
384 } 403 }
385 ], 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 ],
386 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 424 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
387 ( 425 (
388 $self->{flags} & F_LOCKED 426 $self->{flags} & F_LOCKED
389 ? ( 427 ? (
390 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 428 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
391 ) 429 )
392 : ( 430 : (
393 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 431 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
394 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }], 432 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
395 ["$move_prefix <n>", 433 ["$move_prefix &lt;n&gt;",
396 sub { 434 sub {
397 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) 435 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
398 } 436 }
399 ] 437 ]
400 ) 438 )
401 ), 439 ),
402 ); 440 );
403 441
404 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 442 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
405 } 443 }
406 444
407 1 445 1
408 }; 446 };
409 447
… …
413 . "Middle click - apply\n" 451 . "Middle click - apply\n"
414 . "Shift-Middle click - lock/unlock\n" 452 . "Shift-Middle click - lock/unlock\n"
415 . "Right click - further options" 453 . "Right click - further options"
416 . "</small>\n"; 454 . "</small>\n";
417 455
456 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
457 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
458 : undef;
459
418 $self->{face_widget} ||= new CFClient::UI::Face 460 $self->{face_widget} ||= new CFPlus::UI::Face
419 can_events => 1, 461 can_events => 1,
420 can_hover => 1, 462 can_hover => 1,
421 anim => $self->{anim}, 463 anim => $self->{anim},
422 animspeed => $self->{animspeed}, # TODO# must be set at creation time 464 animspeed => $self->{animspeed}, # TODO# must be set at creation time
423 on_button_down => $button_cb, 465 on_button_down => $button_cb,
424 ; 466 ;
467 $self->{face_widget}{bg} = $bg;
425 $self->{face_widget}{face} = $self->{face}; 468 $self->{face_widget}{face} = $self->{face};
426 $self->{face_widget}{anim} = $self->{anim}; 469 $self->{face_widget}{anim} = $self->{anim};
427 $self->{face_widget}{animspeed} = $self->{animspeed}; 470 $self->{face_widget}{animspeed} = $self->{animspeed};
428 $self->{face_widget}->set_tooltip ( 471 $self->{face_widget}->set_tooltip (
429 "<b>Face/Animation.</b>\n" 472 "<b>Face/Animation.</b>\n"
430 . "Item uses face #$self->{face}. " 473 . "Item uses face #$self->{face}. "
431 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 474 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
432 . "\n\n$tooltip_std" 475 . "\n\n$tooltip_std"
433 ); 476 );
434 477
435 $self->{desc_widget} ||= new CFClient::UI::Label 478 $self->{desc_widget} ||= new CFPlus::UI::Label
436 can_events => 1, 479 can_events => 1,
437 can_hover => 1, 480 can_hover => 1,
438 ellipsise => 2, 481 ellipsise => 2,
439 align => -1, 482 align => -1,
440 on_button_down => $button_cb, 483 on_button_down => $button_cb,
441 ; 484 ;
442 my $desc = CFClient::Item::desc_string $self; 485 my $desc = CFPlus::Item::desc_string $self;
486 $self->{desc_widget}{bg} = $bg;
443 $self->{desc_widget}->set_text ($desc); 487 $self->{desc_widget}->set_text ($desc);
444 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 488 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
445 489
446 $self->{weight_widget} ||= new CFClient::UI::Label 490 $self->{weight_widget} ||= new CFPlus::UI::Label
447 can_events => 1, 491 can_events => 1,
448 can_hover => 1, 492 can_hover => 1,
449 ellipsise => 0, 493 ellipsise => 0,
450 align => 0, 494 align => 0,
451 on_button_down => $button_cb, 495 on_button_down => $button_cb,
452 ; 496 ;
497 $self->{weight_widget}{bg} = $bg;
453 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 498 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
454
455 $self->{weight_widget}->set_tooltip ( 499 $self->{weight_widget}->set_tooltip (
456 "<b>Weight</b>.\n" 500 "<b>Weight</b>.\n"
457 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 501 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
458 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 502 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
459 . "\n\n$tooltip_std" 503 . "\n\n$tooltip_std"

Diff Legend

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