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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines