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.125 by root, Wed Oct 18 12:53:45 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.53';
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 local $SIG{__DIE__};
115 . $_[1]->content->present ($_[0])
116};
117 83
118sub view_over { 84 open STDOUT, ">&", $fh_w;
119 local $indent = $indent + $_[1]->indent; 85 open STDERR, ">&", $fh_w;
120 $_[1]->content->present ($_[0]) 86 close $fh_r;
121} 87 close $fh_w;
122 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
123package CFClient::Database; 127package CFPlus::Database;
124 128
125our @ISA = BerkeleyDB::Btree::; 129our @ISA = BerkeleyDB::Btree::;
126 130
127sub get($$) { 131sub get($$) {
128 my $data; 132 my $data;
… …
135my %DB_SYNC; 139my %DB_SYNC;
136 140
137sub put($$$) { 141sub put($$$) {
138 my ($db, $key, $data) = @_; 142 my ($db, $key, $data) = @_;
139 143
144 my $hkey = $db + 0;
145 Scalar::Util::weaken $db;
140 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 146 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
147 delete $DB_SYNC{$hkey};
148 $db->db_sync if $db;
149 });
141 150
142 $db->db_put ($key => $data) 151 $db->db_put ($key => $data)
143} 152}
144 153
145package CFClient; 154package CFPlus;
146 155
147sub find_rcfile($) { 156sub find_rcfile($) {
148 my $path; 157 my $path;
149 158
150 for (grep !ref, @INC) { 159 for (grep !ref, @INC) {
151 $path = "$_/CFClient/resources/$_[0]"; 160 $path = "$_/CFPlus/resources/$_[0]";
152 return $path if -r $path; 161 return $path if -r $path;
153 } 162 }
154 163
155 die "FATAL: can't find required file $_[0]\n"; 164 die "FATAL: can't find required file $_[0]\n";
156} 165}
157 166
167BEGIN {
168 use Crossfire::Protocol::Base ();
169 *to_json = \&Crossfire::Protocol::Base::to_json;
170 *from_json = \&Crossfire::Protocol::Base::from_json;
171}
172
158sub read_cfg { 173sub read_cfg {
159 my ($file) = @_; 174 my ($file) = @_;
160 175
161 open CFG, $file 176 open my $fh, $file
162 or return; 177 or return;
163 178
164 my $CFG;
165
166 local $/; 179 local $/;
167 $CFG = eval <CFG>; 180 my $CFG = <$fh>;
168 181
169 $::CFG = $CFG; 182 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
170 183 require YAML;
171 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 }
172} 191}
173 192
174sub write_cfg { 193sub write_cfg {
175 my ($file) = @_; 194 my ($file) = @_;
176 195
177 open CFG, ">$file" 196 $::CFG->{VERSION} = $::VERSION;
197
198 open my $fh, ">:utf8", $file
178 or return; 199 or return;
200 print $fh to_json $::CFG;
201}
179 202
180 { 203sub http_proxy {
181 require Data::Dumper; 204 my @proxy = win32_proxy_info;
182 local $Data::Dumper::Purity = 1; 205
183 $::CFG->{VERSION} = $::VERSION; 206 if (@proxy) {
184 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 ()
185 } 212 }
213}
186 214
187 close CFG; 215sub set_proxy {
216 my $proxy = http_proxy
217 or return;
218
219 $ENV{http_proxy} = $proxy;
188} 220}
189 221
190our $DB_ENV; 222our $DB_ENV;
223our $DB_STATE;
224
225sub db_table($) {
226 my ($table) = @_;
227
228 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
229
230 new CFPlus::Database
231 -Env => $DB_ENV,
232 -Filename => $table,
233# -Filename => "database",
234# -Subname => $table,
235 -Property => DB_CHKSUM,
236 -Flags => DB_CREATE | DB_UPGRADE,
237 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
238}
191 239
192{ 240{
193 use strict; 241 use strict;
194 242
195 mkdir "$Crossfire::VARDIR/cfplus", 0777; 243 mkdir "$Crossfire::VARDIR/cfplus", 0777;
… …
204# -ErrPrefix => "DATABASE", 252# -ErrPrefix => "DATABASE",
205 -Verbose => 1, 253 -Verbose => 1,
206 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, 254 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
207 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 255 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
208 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; 256 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
209}
210 257
211sub db_table($) { 258 $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} 259}
225 260
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; 261package CFPlus::Layout;
272 262
273$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 263$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
274 reset_glyph_cache; 264 reset_glyph_cache;
275}; 265};
276 266
277package CFClient::Item; 267package CFPlus::Item;
278 268
279use strict; 269use strict;
280use Crossfire::Protocol::Constants; 270use Crossfire::Protocol::Constants;
281 271
282my $last_enter_count = 1; 272my $last_enter_count = 1;
… …
316} 306}
317 307
318sub do_n_dialog { 308sub do_n_dialog {
319 my ($cb) = @_; 309 my ($cb) = @_;
320 310
321 my $w = new CFClient::UI::FancyFrame 311 my $w = new CFPlus::UI::Toplevel
322 on_delete => sub { $_[0]->destroy; 1 }, 312 on_delete => sub { $_[0]->destroy; 1 },
323 has_close_button => 1, 313 has_close_button => 1,
324 ; 314 ;
325 315
326 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); 316 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
327 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 317 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
328 $vb->add (my $entry = new CFClient::UI::Entry 318 $vb->add (my $entry = new CFPlus::UI::Entry
329 text => $last_enter_count, 319 text => $last_enter_count,
330 on_activate => sub { 320 on_activate => sub {
331 my ($entry) = @_; 321 my ($entry) = @_;
332 $last_enter_count = $entry->get_text; 322 $last_enter_count = $entry->get_text;
333 $cb->($last_enter_count); 323 $cb->($last_enter_count);
… …
355 345
356 if ($self->{container} == $::CONN->{player}{tag}) { 346 if ($self->{container} == $::CONN->{player}{tag}) {
357 $targ = $::CONN->{open_container}; 347 $targ = $::CONN->{open_container};
358 } 348 }
359 349
360 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 350 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
361 $::CONN->send ("move $targ $self->{tag} 0") 351 $::CONN->send ("move $targ $self->{tag} 0")
362 if $targ || !($self->{flags} & F_LOCKED); 352 if $targ || !($self->{flags} & F_LOCKED);
363 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 353 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
364 $self->{flags} & F_LOCKED 354 $self->{flags} & F_LOCKED
365 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 355 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
366 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 356 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
367 } elsif ($ev->{button} == 1) { 357 } elsif ($ev->{button} == 1) {
368 $::CONN->send ("examine $self->{tag}"); 358 $::CONN->send ("examine $self->{tag}");
… …
381 sub { 371 sub {
382 $::CONN->send ("mark ". pack "N", $self->{tag}); 372 $::CONN->send ("mark ". pack "N", $self->{tag});
383 $::CONN->send ("command apply flint and steel"); 373 $::CONN->send ("command apply flint and steel");
384 } 374 }
385 ], 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 ],
386 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 395 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
387 ( 396 (
388 $self->{flags} & F_LOCKED 397 $self->{flags} & F_LOCKED
389 ? ( 398 ? (
390 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 399 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
391 ) 400 )
392 : ( 401 : (
393 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 402 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
394 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }], 403 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
395 ["$move_prefix <n>", 404 ["$move_prefix &lt;n&gt;",
396 sub { 405 sub {
397 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) 406 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
398 } 407 }
399 ] 408 ]
400 ) 409 )
401 ), 410 ),
402 ); 411 );
403 412
404 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 413 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
405 } 414 }
406 415
407 1 416 1
408 }; 417 };
409 418
… …
413 . "Middle click - apply\n" 422 . "Middle click - apply\n"
414 . "Shift-Middle click - lock/unlock\n" 423 . "Shift-Middle click - lock/unlock\n"
415 . "Right click - further options" 424 . "Right click - further options"
416 . "</small>\n"; 425 . "</small>\n";
417 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
418 $self->{face_widget} ||= new CFClient::UI::Face 431 $self->{face_widget} ||= new CFPlus::UI::Face
419 can_events => 1, 432 can_events => 1,
420 can_hover => 1, 433 can_hover => 1,
421 anim => $self->{anim}, 434 anim => $self->{anim},
422 animspeed => $self->{animspeed}, # TODO# must be set at creation time 435 animspeed => $self->{animspeed}, # TODO# must be set at creation time
423 on_button_down => $button_cb, 436 on_button_down => $button_cb,
424 ; 437 ;
438 $self->{face_widget}{bg} = $bg;
425 $self->{face_widget}{face} = $self->{face}; 439 $self->{face_widget}{face} = $self->{face};
426 $self->{face_widget}{anim} = $self->{anim}; 440 $self->{face_widget}{anim} = $self->{anim};
427 $self->{face_widget}{animspeed} = $self->{animspeed}; 441 $self->{face_widget}{animspeed} = $self->{animspeed};
428 $self->{face_widget}->set_tooltip ( 442 $self->{face_widget}->set_tooltip (
429 "<b>Face/Animation.</b>\n" 443 "<b>Face/Animation.</b>\n"
430 . "Item uses face #$self->{face}. " 444 . "Item uses face #$self->{face}. "
431 . ($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. ")
432 . "\n\n$tooltip_std" 446 . "\n\n$tooltip_std"
433 ); 447 );
434 448
435 $self->{desc_widget} ||= new CFClient::UI::Label 449 $self->{desc_widget} ||= new CFPlus::UI::Label
436 can_events => 1, 450 can_events => 1,
437 can_hover => 1, 451 can_hover => 1,
438 ellipsise => 2, 452 ellipsise => 2,
439 align => -1, 453 align => -1,
440 on_button_down => $button_cb, 454 on_button_down => $button_cb,
441 ; 455 ;
442 my $desc = CFClient::Item::desc_string $self; 456 my $desc = CFPlus::Item::desc_string $self;
457 $self->{desc_widget}{bg} = $bg;
443 $self->{desc_widget}->set_text ($desc); 458 $self->{desc_widget}->set_text ($desc);
444 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 459 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
445 460
446 $self->{weight_widget} ||= new CFClient::UI::Label 461 $self->{weight_widget} ||= new CFPlus::UI::Label
447 can_events => 1, 462 can_events => 1,
448 can_hover => 1, 463 can_hover => 1,
449 ellipsise => 0, 464 ellipsise => 0,
450 align => 0, 465 align => 0,
451 on_button_down => $button_cb, 466 on_button_down => $button_cb,
452 ; 467 ;
468 $self->{weight_widget}{bg} = $bg;
453 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 469 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
454
455 $self->{weight_widget}->set_tooltip ( 470 $self->{weight_widget}->set_tooltip (
456 "<b>Weight</b>.\n" 471 "<b>Weight</b>.\n"
457 . ($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. ")
458 . ($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. ")
459 . "\n\n$tooltip_std" 474 . "\n\n$tooltip_std"

Diff Legend

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