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.98 by root, Wed Jul 12 17:20:04 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
33package CFClient::PodToPango; 35BEGIN {
34 36 use Crossfire::Protocol::Base ();
35use base Pod::POM::View::Text; 37 *to_json = \&Crossfire::Protocol::Base::to_json;
36 38 *from_json = \&Crossfire::Protocol::Base::from_json;
37our $VERSION = 1; # bump if resultant formatting changes
38
39our $indent = 0;
40
41*view_seq_code =
42*view_seq_bold = sub { "<b>$_[1]</b>" };
43*view_seq_italic = sub { "<i>$_[1]</i>" };
44*view_seq_space =
45*view_seq_link =
46*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
47
48sub view_seq_text {
49 my $text = $_[1];
50 $text =~ s/\s+/ /g;
51 CFClient::UI::Label::escape ($text)
52} 39}
53 40
54sub view_item { 41=item guard { BLOCK }
55 ("\t" x ($indent / 4))
56 . $_[1]->title->present ($_[0])
57 . "\n\n"
58 . $_[1]->content->present ($_[0])
59}
60 42
61sub view_verbatim { 43Returns an object that executes the given block as soon as it is destroyed.
62 (join "",
63 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
64 split /\n/, CFClient::UI::Label::escape ($_[1]))
65 . "\n"
66}
67 44
68sub view_textblock { 45=cut
69 ("\t" x ($indent / 2)) . "$_[1]\n\n"
70}
71 46
72sub view_head1 { 47sub guard(&) {
73 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 48 bless \(my $cb = $_[0]), "CFPlus::Guard"
74 . $_[1]->content->present ($_[0])
75};
76
77sub view_head2 {
78 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
79 . $_[1]->content->present ($_[0])
80};
81
82sub view_head3 {
83 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
84 . $_[1]->content->present ($_[0])
85};
86
87sub view_over {
88 local $indent = $indent + $_[1]->indent;
89 $_[1]->content->present ($_[0])
90} 49}
91 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
92package CFClient::Database; 149package CFPlus::Database;
93 150
94our @ISA = BerkeleyDB::Btree::; 151our @ISA = BerkeleyDB::Btree::;
95 152
96sub get($$) { 153sub get($$) {
97 my $data; 154 my $data;
… …
104my %DB_SYNC; 161my %DB_SYNC;
105 162
106sub put($$$) { 163sub put($$$) {
107 my ($db, $key, $data) = @_; 164 my ($db, $key, $data) = @_;
108 165
166 my $hkey = $db + 0;
167 Scalar::Util::weaken $db;
109 $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 });
110 172
111 $db->db_put ($key => $data) 173 $db->db_put ($key => $data)
112} 174}
113 175
114package CFClient; 176package CFPlus;
115 177
116sub find_rcfile($) { 178sub find_rcfile($) {
117 my $path; 179 my $path;
118 180
119 for (grep !ref, @INC) { 181 for (grep !ref, @INC) {
120 $path = "$_/CFClient/resources/$_[0]"; 182 $path = "$_/CFPlus/resources/$_[0]";
121 return $path if -r $path; 183 return $path if -r $path;
122 } 184 }
123 185
124 die "FATAL: can't find required file $_[0]\n"; 186 die "FATAL: can't find required file $_[0]\n";
125} 187}
126 188
127sub read_cfg { 189sub read_cfg {
128 my ($file) = @_; 190 my ($file) = @_;
129 191
130 open CFG, $file 192 open my $fh, $file
131 or return; 193 or return;
132 194
133 my $CFG;
134
135 local $/; 195 local $/;
136 $CFG = eval <CFG>; 196 my $CFG = <$fh>;
137 197
138 $::CFG = $CFG; 198 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
139 199 require YAML;
140 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 }
141} 207}
142 208
143sub write_cfg { 209sub write_cfg {
144 my ($file) = @_; 210 my ($file) = @_;
145 211
146 open CFG, ">$file" 212 $::CFG->{VERSION} = $::VERSION;
213
214 open my $fh, ">:utf8", $file
147 or return; 215 or return;
216 print $fh to_json $::CFG;
217}
148 218
149 { 219sub http_proxy {
150 require Data::Dumper; 220 my @proxy = win32_proxy_info;
151 local $Data::Dumper::Purity = 1; 221
152 $::CFG->{VERSION} = $::VERSION; 222 if (@proxy) {
153 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 ()
154 } 228 }
229}
155 230
156 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
157} 258}
158 259
159our $DB_ENV; 260our $DB_ENV;
160 261our $DB_STATE;
161{
162 use strict;
163
164 mkdir "$Crossfire::VARDIR/cfplus", 0777;
165 my $recover = $BerkeleyDB::db_version >= 4.4
166 ? eval "DB_REGISTER | DB_RECOVER"
167 : 0;
168
169 $DB_ENV = new BerkeleyDB::Env
170 -Home => "$Crossfire::VARDIR/cfplus",
171 -Cachesize => 1_000_000,
172 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
173# -ErrPrefix => "DATABASE",
174 -Verbose => 1,
175 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
176 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
177 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
178}
179 262
180sub db_table($) { 263sub db_table($) {
181 my ($table) = @_; 264 my ($table) = @_;
182 265
183 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 266 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
184 267
185 new CFClient::Database 268 new CFPlus::Database
186 -Env => $DB_ENV, 269 -Env => $DB_ENV,
187 -Filename => $table, 270 -Filename => $table,
188# -Filename => "database", 271# -Filename => "database",
189# -Subname => $table, 272# -Subname => $table,
190 -Property => DB_CHKSUM, 273 -Property => DB_CHKSUM,
191 -Flags => DB_CREATE | DB_UPGRADE, 274 -Flags => DB_CREATE | DB_UPGRADE,
192 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 275 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
193} 276}
194 277
195my $pod_cache = db_table "pod_cache"; 278our $DB_HOME = "$Crossfire::VARDIR/cfplus";
196 279
197sub load_pod($$$$) { 280sub open_db {
198 my ($path, $filtertype, $filterversion, $filtercb) = @_; 281 use strict;
199 282
200 stat $path 283 mkdir $DB_HOME, 0777;
201 or die "$path: $!"; 284 my $recover = $BerkeleyDB::db_version >= 4.4
285 ? eval "DB_REGISTER | DB_RECOVER"
286 : 0;
202 287
203 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";
204 297
205 my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } }; 298 $DB_STATE = db_table "state";
206 299
207 return $pom if $chash eq $phash;
208
209 my $pod = do {
210 local $/;
211 open my $pod, "<:utf8", $_[0]
212 or die "$_[0]: $!";
213 <$pod>
214 };
215
216 #utf8::downgrade $pod;
217
218 $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
219
220 $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
221
222 $pom
223}
224
225sub pod_to_pango($) {
226 my ($pom) = @_;
227
228 $pom->present ("CFClient::PodToPango")
229}
230
231sub pod_to_pango_list($) {
232 my ($pom) = @_;
233
234 [ 300 1
235 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
236 split /\n/, $pom->present ("CFClient::PodToPango")
237 ]
238} 301}
239 302
303unless (eval { open_db }) {
304 File::Path::rmtree $DB_HOME;
305 open_db;
306}
307
240package CFClient::Layout; 308package CFPlus::Layout;
241 309
242$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 310$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
243 reset_glyph_cache; 311 reset_glyph_cache;
244}; 312};
245 313
246package CFClient::Item; 314package CFPlus::Item;
247 315
248use strict; 316use strict;
249use Crossfire::Protocol::Constants; 317use Crossfire::Protocol::Constants;
250 318
251my $last_enter_count = 1; 319my $last_enter_count = 1;
… …
285} 353}
286 354
287sub do_n_dialog { 355sub do_n_dialog {
288 my ($cb) = @_; 356 my ($cb) = @_;
289 357
290 my $w = new CFClient::UI::FancyFrame; 358 my $w = new CFPlus::UI::Toplevel
359 on_delete => sub { $_[0]->destroy; 1 },
360 has_close_button => 1,
361 ;
362
291 $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");
292 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 364 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
293 $vb->add (my $entry = new CFClient::UI::Entry 365 $vb->add (my $entry = new CFPlus::UI::Entry
294 text => $last_enter_count, 366 text => $last_enter_count,
295 on_activate => sub { 367 on_activate => sub {
296 my ($entry) = @_; 368 my ($entry) = @_;
297 $last_enter_count = $entry->get_text; 369 $last_enter_count = $entry->get_text;
298 $cb->($last_enter_count); 370 $cb->($last_enter_count);
299 $w->hide; 371 $w->hide;
300 $w = undef; 372 $w->destroy;
373
374 0
301 } 375 },
376 on_escape => sub { $w->destroy; 1 },
302 ); 377 );
303 $entry->grab_focus; 378 $entry->grab_focus;
304 $w->show; 379 $w->show;
305
306} 380}
307 381
308sub update_widgets { 382sub update_widgets {
309 my ($self) = @_; 383 my ($self) = @_;
310 384
… …
318 392
319 if ($self->{container} == $::CONN->{player}{tag}) { 393 if ($self->{container} == $::CONN->{player}{tag}) {
320 $targ = $::CONN->{open_container}; 394 $targ = $::CONN->{open_container};
321 } 395 }
322 396
323 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 397 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
324 $::CONN->send ("move $targ $self->{tag} 0") 398 $::CONN->send ("move $targ $self->{tag} 0")
325 if $targ || !($self->{flags} & F_LOCKED); 399 if $targ || !($self->{flags} & F_LOCKED);
326 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 400 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
327 $self->{flags} & F_LOCKED 401 $self->{flags} & F_LOCKED
328 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 402 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
329 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 403 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
330 } elsif ($ev->{button} == 1) { 404 } elsif ($ev->{button} == 1) {
331 $::CONN->send ("examine $self->{tag}"); 405 $::CONN->send ("examine $self->{tag}");
332 } elsif ($ev->{button} == 2) { 406 } elsif ($ev->{button} == 2) {
333 $::CONN->send ("apply $self->{tag}"); 407 $::CONN->send ("apply $self->{tag}");
334 } elsif ($ev->{button} == 3) { 408 } elsif ($ev->{button} == 3) {
409 my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
410 if ($self->{container} == $::CONN->{open_container}) {
411 $move_prefix = "take";
412 }
413
414 my $shortname = CFPlus::shorten $self->{name}, 14;
415
335 my @menu_items = ( 416 my @menu_items = (
336 ["examine", sub { $::CONN->send ("examine $self->{tag}") }], 417 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
337 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 418 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
419 ["ignite/thaw", # first try of an easier use of flint&steel
420 sub {
421 $::CONN->send ("mark ". pack "N", $self->{tag});
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");
442 }
443 ],
338 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 444 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
339 ( 445 (
340 $self->{flags} & F_LOCKED 446 $self->{flags} & F_LOCKED
341 ? ( 447 ? (
342 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 448 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
343 ) 449 )
344 : ( 450 : (
345 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 451 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
346 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], 452 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
347 ["move n", 453 ["$move_prefix &lt;n&gt;",
348 sub { 454 sub {
349 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) 455 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
350 } 456 }
351 ] 457 ]
352 ) 458 )
353 ), 459 ),
460 ["bind <i>apply $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["apply $self->{name}"]) }],
354 ); 461 );
355 462
356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 463 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
357 } 464 }
358 465
359 1 466 1
360 }; 467 };
361 468
… …
365 . "Middle click - apply\n" 472 . "Middle click - apply\n"
366 . "Shift-Middle click - lock/unlock\n" 473 . "Shift-Middle click - lock/unlock\n"
367 . "Right click - further options" 474 . "Right click - further options"
368 . "</small>\n"; 475 . "</small>\n";
369 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
370 $self->{face_widget} ||= new CFClient::UI::Face 481 $self->{face_widget} ||= new CFPlus::UI::Face
371 can_events => 1, 482 can_events => 1,
372 can_hover => 1, 483 can_hover => 1,
373 anim => $self->{anim}, 484 anim => $self->{anim},
374 animspeed => $self->{animspeed}, # TODO# must be set at creation time 485 animspeed => $self->{animspeed}, # TODO# must be set at creation time
375 on_button_down => $button_cb, 486 on_button_down => $button_cb,
376 ; 487 ;
488 $self->{face_widget}{bg} = $bg;
377 $self->{face_widget}{face} = $self->{face}; 489 $self->{face_widget}{face} = $self->{face};
378 $self->{face_widget}{anim} = $self->{anim}; 490 $self->{face_widget}{anim} = $self->{anim};
379 $self->{face_widget}{animspeed} = $self->{animspeed}; 491 $self->{face_widget}{animspeed} = $self->{animspeed};
380 $self->{face_widget}->set_tooltip ( 492 $self->{face_widget}->set_tooltip (
381 "<b>Face/Animation.</b>\n" 493 "<b>Face/Animation.</b>\n"
382 . "Item uses face #$self->{face}. " 494 . "Item uses face #$self->{face}. "
383 . ($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. ")
384 . "\n\n$tooltip_std" 496 . "\n\n$tooltip_std"
385 ); 497 );
386 498
387 $self->{desc_widget} ||= new CFClient::UI::Label 499 $self->{desc_widget} ||= new CFPlus::UI::Label
388 can_events => 1, 500 can_events => 1,
389 can_hover => 1, 501 can_hover => 1,
390 ellipsise => 2, 502 ellipsise => 2,
391 align => -1, 503 align => -1,
392 on_button_down => $button_cb, 504 on_button_down => $button_cb,
393 ; 505 ;
394 my $desc = CFClient::Item::desc_string $self; 506 my $desc = CFPlus::Item::desc_string $self;
507 $self->{desc_widget}{bg} = $bg;
395 $self->{desc_widget}->set_text ($desc); 508 $self->{desc_widget}->set_text ($desc);
396 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 509 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
397 510
398 $self->{weight_widget} ||= new CFClient::UI::Label 511 $self->{weight_widget} ||= new CFPlus::UI::Label
399 can_events => 1, 512 can_events => 1,
400 can_hover => 1, 513 can_hover => 1,
401 ellipsise => 0, 514 ellipsise => 0,
402 align => 0, 515 align => 0,
403 on_button_down => $button_cb, 516 on_button_down => $button_cb,
404 ; 517 ;
518 $self->{weight_widget}{bg} = $bg;
405 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 519 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
406
407 $self->{weight_widget}->set_tooltip ( 520 $self->{weight_widget}->set_tooltip (
408 "<b>Weight</b>.\n" 521 "<b>Weight</b>.\n"
409 . ($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. ")
410 . ($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. ")
411 . "\n\n$tooltip_std" 524 . "\n\n$tooltip_std"

Diff Legend

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