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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines