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.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 = ( 43=item guard { BLOCK }
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 44
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.", 45Returns an object that executes the given block as soon as it is destroyed.
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 46
50package CFClient::PodToPango; 47=cut
51 48
52use base Pod::POM::View::Text; 49sub guard(&) {
53 50 bless \(my $cb = $_[0]), "CFPlus::Guard"
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} 51}
70 52
71sub view_item { 53sub CFPlus::Guard::DESTROY {
72 ("\t" x ($indent / 4)) 54 ${$_[0]}->()
73 . $_[1]->title->present ($_[0])
74 . "\n\n"
75 . $_[1]->content->present ($_[0])
76} 55}
77 56
78sub view_verbatim { 57sub asxml($) {
79 (join "", 58 local $_ = $_[0];
80 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
81 split /\n/, CFClient::UI::Label::escape ($_[1]))
82 . "\n"
83}
84 59
85sub view_textblock { 60 s/&/&amp;/g;
86 ("\t" x ($indent / 2)) . "$_[1]\n\n" 61 s/>/&gt;/g;
87} 62 s/</&lt;/g;
88 63
89sub view_head1 { 64 $_
90 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
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} 65}
108 66
67sub 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
74sub 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 $SIG{__DIE__} = sub {
83 my $msg = $_[0];
84 $msg =~ s/\n+/\n/;
85 warn "FATAL: $msg";
86 CFPlus::_exit 99;
87 };
88
89 open STDOUT, ">&", $fh_w;
90 open STDERR, ">&", $fh_w;
91 close $fh_r;
92 close $fh_w;
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
109package CFClient::Database; 124package CFPlus::Database;
110 125
111our @ISA = BerkeleyDB::Btree::; 126our @ISA = BerkeleyDB::Btree::;
112 127
113sub get($$) { 128sub get($$) {
114 my $data; 129 my $data;
121my %DB_SYNC; 136my %DB_SYNC;
122 137
123sub put($$$) { 138sub put($$$) {
124 my ($db, $key, $data) = @_; 139 my ($db, $key, $data) = @_;
125 140
141 my $hkey = $db + 0;
142 Scalar::Util::weaken $db;
126 $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 });
127 147
128 $db->db_put ($key => $data) 148 $db->db_put ($key => $data)
129} 149}
130 150
131package CFClient; 151package CFPlus;
132 152
133sub find_rcfile($) { 153sub find_rcfile($) {
134 my $path; 154 my $path;
135 155
136 for (grep !ref, @INC) { 156 for (grep !ref, @INC) {
137 $path = "$_/CFClient/resources/$_[0]"; 157 $path = "$_/CFPlus/resources/$_[0]";
138 return $path if -r $path; 158 return $path if -r $path;
139 } 159 }
140 160
141 die "FATAL: can't find required file $_[0]\n"; 161 die "FATAL: can't find required file $_[0]\n";
142} 162}
143 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
144sub read_cfg { 170sub read_cfg {
145 my ($file) = @_; 171 my ($file) = @_;
146 172
147 open CFG, $file 173 open my $fh, $file
148 or return; 174 or return;
149 175
150 my $CFG;
151
152 local $/; 176 local $/;
153 $CFG = eval <CFG>; 177 my $CFG = <$fh>;
154 178
155 $::CFG = $CFG; 179 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
156 180 require YAML;
157 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 }
158} 188}
159 189
160sub write_cfg { 190sub write_cfg {
161 my ($file) = @_; 191 my ($file) = @_;
162 192
163 open CFG, ">$file" 193 $::CFG->{VERSION} = $::VERSION;
194
195 open my $fh, ">:utf8", $file
164 or return; 196 or return;
197 print $fh to_json $::CFG;
198}
165 199
166 { 200sub http_proxy {
167 require Data::Dumper; 201 my @proxy = win32_proxy_info;
168 local $Data::Dumper::Purity = 1; 202
169 $::CFG->{VERSION} = $::VERSION; 203 if (@proxy) {
170 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 ()
171 } 209 }
210}
172 211
173 close CFG; 212sub set_proxy {
213 my $proxy = http_proxy
214 or return;
215
216 $ENV{http_proxy} = $proxy;
174} 217}
175 218
176our $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}
177 236
178{ 237{
179 use strict; 238 use strict;
180 239
181 mkdir "$Crossfire::VARDIR/cfplus", 0777; 240 mkdir "$Crossfire::VARDIR/cfplus", 0777;
190# -ErrPrefix => "DATABASE", 249# -ErrPrefix => "DATABASE",
191 -Verbose => 1, 250 -Verbose => 1,
192 -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,
193 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 252 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
194 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";
195}
196 254
197sub db_table($) { 255 $DB_STATE = db_table "state";
198 my ($table) = @_;
199
200 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
201
202 new CFClient::Database
203 -Env => $DB_ENV,
204 -Filename => $table,
205# -Filename => "database",
206# -Subname => $table,
207 -Property => DB_CHKSUM,
208 -Flags => DB_CREATE | DB_UPGRADE,
209 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
210} 256}
211 257
212my $pod_cache = db_table "pod_cache";
213
214sub load_pod($$$$) {
215 my ($path, $filtertype, $filterversion, $filtercb) = @_;
216
217 stat $path
218 or die "$path: $!";
219
220 my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
221
222 my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
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}
241
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; 258package CFPlus::Layout;
258 259
259$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 260$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
260 reset_glyph_cache; 261 reset_glyph_cache;
261}; 262};
262 263
263package CFClient::Item; 264package CFPlus::Item;
264 265
265use strict; 266use strict;
266use Crossfire::Protocol::Constants; 267use Crossfire::Protocol::Constants;
267 268
268my $last_enter_count = 1; 269my $last_enter_count = 1;
302} 303}
303 304
304sub do_n_dialog { 305sub do_n_dialog {
305 my ($cb) = @_; 306 my ($cb) = @_;
306 307
307 my $w = new CFClient::UI::FancyFrame 308 my $w = new CFPlus::UI::Toplevel
308 on_delete => sub { $_[0]->destroy; 1 }, 309 on_delete => sub { $_[0]->destroy; 1 },
309 has_close_button => 1, 310 has_close_button => 1,
310 ; 311 ;
311 312
312 $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");
313 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 314 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
314 $vb->add (my $entry = new CFClient::UI::Entry 315 $vb->add (my $entry = new CFPlus::UI::Entry
315 text => $last_enter_count, 316 text => $last_enter_count,
316 on_activate => sub { 317 on_activate => sub {
317 my ($entry) = @_; 318 my ($entry) = @_;
318 $last_enter_count = $entry->get_text; 319 $last_enter_count = $entry->get_text;
319 $cb->($last_enter_count); 320 $cb->($last_enter_count);
341 342
342 if ($self->{container} == $::CONN->{player}{tag}) { 343 if ($self->{container} == $::CONN->{player}{tag}) {
343 $targ = $::CONN->{open_container}; 344 $targ = $::CONN->{open_container};
344 } 345 }
345 346
346 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 347 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
347 $::CONN->send ("move $targ $self->{tag} 0") 348 $::CONN->send ("move $targ $self->{tag} 0")
348 if $targ || !($self->{flags} & F_LOCKED); 349 if $targ || !($self->{flags} & F_LOCKED);
349 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 350 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
350 $self->{flags} & F_LOCKED 351 $self->{flags} & F_LOCKED
351 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 352 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
352 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 353 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
353 } elsif ($ev->{button} == 1) { 354 } elsif ($ev->{button} == 1) {
354 $::CONN->send ("examine $self->{tag}"); 355 $::CONN->send ("examine $self->{tag}");
367 sub { 368 sub {
368 $::CONN->send ("mark ". pack "N", $self->{tag}); 369 $::CONN->send ("mark ". pack "N", $self->{tag});
369 $::CONN->send ("command apply flint and steel"); 370 $::CONN->send ("command apply flint and steel");
370 } 371 }
371 ], 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 ],
372 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 392 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
373 ( 393 (
374 $self->{flags} & F_LOCKED 394 $self->{flags} & F_LOCKED
375 ? ( 395 ? (
376 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 396 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
377 ) 397 )
378 : ( 398 : (
379 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 399 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
380 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }], 400 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
381 ["$move_prefix n", 401 ["$move_prefix &lt;n&gt;",
382 sub { 402 sub {
383 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) 403 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
384 } 404 }
385 ] 405 ]
386 ) 406 )
387 ), 407 ),
388 ); 408 );
389 409
390 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 410 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
391 } 411 }
392 412
393 1 413 1
394 }; 414 };
395 415
399 . "Middle click - apply\n" 419 . "Middle click - apply\n"
400 . "Shift-Middle click - lock/unlock\n" 420 . "Shift-Middle click - lock/unlock\n"
401 . "Right click - further options" 421 . "Right click - further options"
402 . "</small>\n"; 422 . "</small>\n";
403 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
404 $self->{face_widget} ||= new CFClient::UI::Face 428 $self->{face_widget} ||= new CFPlus::UI::Face
405 can_events => 1, 429 can_events => 1,
406 can_hover => 1, 430 can_hover => 1,
407 anim => $self->{anim}, 431 anim => $self->{anim},
408 animspeed => $self->{animspeed}, # TODO# must be set at creation time 432 animspeed => $self->{animspeed}, # TODO# must be set at creation time
409 on_button_down => $button_cb, 433 on_button_down => $button_cb,
410 ; 434 ;
435 $self->{face_widget}{bg} = $bg;
411 $self->{face_widget}{face} = $self->{face}; 436 $self->{face_widget}{face} = $self->{face};
412 $self->{face_widget}{anim} = $self->{anim}; 437 $self->{face_widget}{anim} = $self->{anim};
413 $self->{face_widget}{animspeed} = $self->{animspeed}; 438 $self->{face_widget}{animspeed} = $self->{animspeed};
414 $self->{face_widget}->set_tooltip ( 439 $self->{face_widget}->set_tooltip (
415 "<b>Face/Animation.</b>\n" 440 "<b>Face/Animation.</b>\n"
416 . "Item uses face #$self->{face}. " 441 . "Item uses face #$self->{face}. "
417 . ($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. ")
418 . "\n\n$tooltip_std" 443 . "\n\n$tooltip_std"
419 ); 444 );
420 445
421 $self->{desc_widget} ||= new CFClient::UI::Label 446 $self->{desc_widget} ||= new CFPlus::UI::Label
422 can_events => 1, 447 can_events => 1,
423 can_hover => 1, 448 can_hover => 1,
424 ellipsise => 2, 449 ellipsise => 2,
425 align => -1, 450 align => -1,
426 on_button_down => $button_cb, 451 on_button_down => $button_cb,
427 ; 452 ;
428 my $desc = CFClient::Item::desc_string $self; 453 my $desc = CFPlus::Item::desc_string $self;
454 $self->{desc_widget}{bg} = $bg;
429 $self->{desc_widget}->set_text ($desc); 455 $self->{desc_widget}->set_text ($desc);
430 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 456 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
431 457
432 $self->{weight_widget} ||= new CFClient::UI::Label 458 $self->{weight_widget} ||= new CFPlus::UI::Label
433 can_events => 1, 459 can_events => 1,
434 can_hover => 1, 460 can_hover => 1,
435 ellipsise => 0, 461 ellipsise => 0,
436 align => 0, 462 align => 0,
437 on_button_down => $button_cb, 463 on_button_down => $button_cb,
438 ; 464 ;
465 $self->{weight_widget}{bg} = $bg;
439 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 466 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
440
441 $self->{weight_widget}->set_tooltip ( 467 $self->{weight_widget}->set_tooltip (
442 "<b>Weight</b>.\n" 468 "<b>Weight</b>.\n"
443 . ($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. ")
444 . ($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. ")
445 . "\n\n$tooltip_std" 471 . "\n\n$tooltip_std"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines