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

Diff Legend

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