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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines