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.131 by root, Tue Dec 5 00:52:56 2006 UTC vs.
Revision 1.164 by root, Tue Dec 25 18:58:32 2007 UTC

… …
15package CFPlus; 15package CFPlus;
16 16
17use Carp (); 17use Carp ();
18 18
19BEGIN { 19BEGIN {
20 $VERSION = '0.97'; 20 $VERSION = '0.9960';
21 21
22 use XSLoader; 22 use XSLoader;
23 XSLoader::load "CFPlus", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
24} 24}
25 25
26use utf8; 26use utf8;
27 27
28use AnyEvent (); 28use AnyEvent ();
29use BerkeleyDB;
30use Pod::POM (); 29use Pod::POM ();
31use Scalar::Util (); 30use File::Path ();
32use Storable (); # finally 31use Storable (); # finally
33 32use Fcntl ();
34BEGIN { 33use JSON::XS qw(encode_json decode_json);
35 use Crossfire::Protocol::Base ();
36 *to_json = \&Crossfire::Protocol::Base::to_json;
37 *from_json = \&Crossfire::Protocol::Base::from_json;
38}
39 34
40=item guard { BLOCK } 35=item guard { BLOCK }
41 36
42Returns an object that executes the given block as soon as it is destroyed. 37Returns an object that executes the given block as soon as it is destroyed.
43 38
… …
47 bless \(my $cb = $_[0]), "CFPlus::Guard" 42 bless \(my $cb = $_[0]), "CFPlus::Guard"
48} 43}
49 44
50sub CFPlus::Guard::DESTROY { 45sub CFPlus::Guard::DESTROY {
51 ${$_[0]}->() 46 ${$_[0]}->()
47}
48
49=item shorten $string[, $maxlength]
50
51=cut
52
53sub shorten($;$) {
54 my ($str, $len) = @_;
55 substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
56 $str
52} 57}
53 58
54sub asxml($) { 59sub asxml($) {
55 local $_ = $_[0]; 60 local $_ = $_[0];
56 61
… …
61 $_ 66 $_
62} 67}
63 68
64sub socketpipe() { 69sub socketpipe() {
65 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 70 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
66 or die "cannot establish bidiretcional pipe: $!\n"; 71 or die "cannot establish bidirectional pipe: $!\n";
67 72
68 ($fh1, $fh2) 73 ($fh1, $fh2)
69} 74}
70 75
71sub background(&;&) { 76sub background(&;&) {
… …
114 while ($buffer =~ s/^(.*)\n//) { 119 while ($buffer =~ s/^(.*)\n//) {
115 my $line = $1; 120 my $line = $1;
116 $line =~ s/\s+$//; 121 $line =~ s/\s+$//;
117 utf8::decode $line; 122 utf8::decode $line;
118 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 123 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
119 $cb->(from_json $1); 124 $cb->(JSON::XS->new->allow_nonref->decode ($1));
120 } else { 125 } else {
121 ::message ({ 126 ::message ({
122 markup => "background($pid): " . CFPlus::asxml $line, 127 markup => "background($pid): " . CFPlus::asxml $line,
123 }); 128 });
124 } 129 }
… …
127} 132}
128 133
129sub background_msg { 134sub background_msg {
130 my ($msg) = @_; 135 my ($msg) = @_;
131 136
132 $msg = "\x{e877}json_msg " . to_json $msg; 137 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
133 $msg =~ s/\n//g; 138 $msg =~ s/\n//g;
134 utf8::encode $msg; 139 utf8::encode $msg;
135 print $msg, "\n"; 140 print $msg, "\n";
136}
137
138package CFPlus::Database;
139
140our @ISA = BerkeleyDB::Btree::;
141
142sub get($$) {
143 my $data;
144
145 $_[0]->db_get ($_[1], $data) == 0
146 ? $data
147 : ()
148}
149
150my %DB_SYNC;
151
152sub put($$$) {
153 my ($db, $key, $data) = @_;
154
155 my $hkey = $db + 0;
156 Scalar::Util::weaken $db;
157 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
158 delete $DB_SYNC{$hkey};
159 $db->db_sync if $db;
160 });
161
162 $db->db_put ($key => $data)
163} 141}
164 142
165package CFPlus; 143package CFPlus;
166 144
167sub find_rcfile($) { 145sub find_rcfile($) {
… …
187 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove 165 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
188 require YAML; 166 require YAML;
189 utf8::decode $CFG; 167 utf8::decode $CFG;
190 $::CFG = YAML::Load ($CFG); 168 $::CFG = YAML::Load ($CFG);
191 } elsif ($CFG =~ /^\{/) { 169 } elsif ($CFG =~ /^\{/) {
192 $::CFG = from_json $CFG; 170 $::CFG = decode_json $CFG;
193 } else { 171 } else {
194 $::CFG = eval $CFG; ## todo comaptibility cruft 172 $::CFG = eval $CFG; ## todo comaptibility cruft
195 } 173 }
196} 174}
197 175
… …
200 178
201 $::CFG->{VERSION} = $::VERSION; 179 $::CFG->{VERSION} = $::VERSION;
202 180
203 open my $fh, ">:utf8", $file 181 open my $fh, ">:utf8", $file
204 or return; 182 or return;
205 print $fh to_json $::CFG; 183 print $fh encode_json $::CFG;
206} 184}
207 185
208sub http_proxy { 186sub http_proxy {
209 my @proxy = win32_proxy_info; 187 my @proxy = win32_proxy_info;
210 188
… …
244 and die $res->status_line; 222 and die $res->status_line;
245 223
246 $res 224 $res
247} 225}
248 226
249our $DB_ENV; 227sub fh_nonblocking($$) {
250our $DB_STATE;
251
252sub db_table($) {
253 my ($table) = @_; 228 my ($fh, $nb) = @_;
254 229
255 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 230 if ($^O eq "MSWin32") {
231 $nb = (! ! $nb) + 0;
232 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
233 } else {
234 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
235 }
256 236
257 new CFPlus::Database
258 -Env => $DB_ENV,
259 -Filename => $table,
260# -Filename => "database",
261# -Subname => $table,
262 -Property => DB_CHKSUM,
263 -Flags => DB_CREATE | DB_UPGRADE,
264 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
265}
266
267{
268 use strict;
269
270 my $HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version";
271
272 mkdir $HOME, 0777;
273 my $recover = $BerkeleyDB::db_version >= 4.4
274 ? eval "DB_REGISTER | DB_RECOVER"
275 : 0;
276
277 $DB_ENV = new BerkeleyDB::Env
278 -Home => $HOME,
279 -Cachesize => 1_000_000,
280 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
281# -ErrPrefix => "DATABASE",
282 -Verbose => 1,
283 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
284 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
285 or die "unable to create/open database home $HOME: $BerkeleyDB::Error";
286
287 $DB_STATE = db_table "state";
288} 237}
289 238
290package CFPlus::Layout; 239package CFPlus::Layout;
291 240
241$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Layout"} = sub {
242 glyph_cache_restore;
243};
244
292$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 245$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
293 reset_glyph_cache; 246 glyph_cache_backup;
294}; 247};
295
296package CFPlus::Item;
297
298use strict;
299use Crossfire::Protocol::Constants;
300
301my $last_enter_count = 1;
302
303sub desc_string {
304 my ($self) = @_;
305
306 my $desc =
307 $self->{nrof} < 2
308 ? $self->{name}
309 : "$self->{nrof} × $self->{name_pl}";
310
311 $self->{flags} & F_OPEN
312 and $desc .= " (open)";
313 $self->{flags} & F_APPLIED
314 and $desc .= " (applied)";
315 $self->{flags} & F_UNPAID
316 and $desc .= " (unpaid)";
317 $self->{flags} & F_MAGIC
318 and $desc .= " (magic)";
319 $self->{flags} & F_CURSED
320 and $desc .= " (cursed)";
321 $self->{flags} & F_DAMNED
322 and $desc .= " (damned)";
323 $self->{flags} & F_LOCKED
324 and $desc .= " *";
325
326 $desc
327}
328
329sub weight_string {
330 my ($self) = @_;
331
332 my $weight = ($self->{nrof} || 1) * $self->{weight};
333
334 $weight < 0 ? "?" : $weight * 0.001
335}
336
337sub do_n_dialog {
338 my ($cb) = @_;
339
340 my $w = new CFPlus::UI::Toplevel
341 on_delete => sub { $_[0]->destroy; 1 },
342 has_close_button => 1,
343 ;
344
345 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
346 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
347 $vb->add (my $entry = new CFPlus::UI::Entry
348 text => $last_enter_count,
349 on_activate => sub {
350 my ($entry) = @_;
351 $last_enter_count = $entry->get_text;
352 $cb->($last_enter_count);
353 $w->hide;
354 $w->destroy;
355
356 0
357 },
358 on_escape => sub { $w->destroy; 1 },
359 );
360 $entry->grab_focus;
361 $w->show;
362}
363
364sub update_widgets {
365 my ($self) = @_;
366
367 # necessary to avoid cyclic references
368 Scalar::Util::weaken $self;
369
370 my $button_cb = sub {
371 my (undef, $ev, $x, $y) = @_;
372
373 my $targ = $::CONN->{player}{tag};
374
375 if ($self->{container} == $::CONN->{player}{tag}) {
376 $targ = $::CONN->{open_container};
377 }
378
379 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
380 $::CONN->send ("move $targ $self->{tag} 0")
381 if $targ || !($self->{flags} & F_LOCKED);
382 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
383 $self->{flags} & F_LOCKED
384 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
385 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
386 } elsif ($ev->{button} == 1) {
387 $::CONN->send ("examine $self->{tag}");
388 } elsif ($ev->{button} == 2) {
389 $::CONN->send ("apply $self->{tag}");
390 } elsif ($ev->{button} == 3) {
391 my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
392 if ($self->{container} == $::CONN->{open_container}) {
393 $move_prefix = "take";
394 }
395
396 my @menu_items = (
397 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
398 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
399 ["ignite/thaw", # first try of an easier use of flint&steel
400 sub {
401 $::CONN->send ("mark ". pack "N", $self->{tag});
402 $::CONN->send ("command apply flint and steel");
403 }
404 ],
405 ["inscribe", # first try of an easier use of flint&steel
406 sub {
407 &::open_string_query ("Text to inscribe", sub {
408 my ($entry, $txt) = @_;
409 $::CONN->send ("mark ". pack "N", $self->{tag});
410 $::CONN->send ("command use_skill inscription $txt");
411 });
412 }
413 ],
414 ["rename", # first try of an easier use of flint&steel
415 sub {
416 &::open_string_query ("Rename item to:", sub {
417 my ($entry, $txt) = @_;
418 $::CONN->send ("mark ". pack "N", $self->{tag});
419 $::CONN->send ("command rename to <$txt>");
420 }, $self->{name},
421 "If you input no name or erase the current custom name, the custom name will be unset");
422 }
423 ],
424 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
425 (
426 $self->{flags} & F_LOCKED
427 ? (
428 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
429 )
430 : (
431 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
432 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
433 ["$move_prefix &lt;n&gt;",
434 sub {
435 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
436 }
437 ]
438 )
439 ),
440 );
441
442 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
443 }
444
445 1
446 };
447
448 my $tooltip_std = "<small>"
449 . "Left click - examine item\n"
450 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
451 . "Middle click - apply\n"
452 . "Shift-Middle click - lock/unlock\n"
453 . "Right click - further options"
454 . "</small>\n";
455
456 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
457 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
458 : undef;
459
460 $self->{face_widget} ||= new CFPlus::UI::Face
461 can_events => 1,
462 can_hover => 1,
463 anim => $self->{anim},
464 animspeed => $self->{animspeed}, # TODO# must be set at creation time
465 on_button_down => $button_cb,
466 ;
467 $self->{face_widget}{bg} = $bg;
468 $self->{face_widget}{face} = $self->{face};
469 $self->{face_widget}{anim} = $self->{anim};
470 $self->{face_widget}{animspeed} = $self->{animspeed};
471 $self->{face_widget}->set_tooltip (
472 "<b>Face/Animation.</b>\n"
473 . "Item uses face #$self->{face}. "
474 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
475 . "\n\n$tooltip_std"
476 );
477
478 $self->{desc_widget} ||= new CFPlus::UI::Label
479 can_events => 1,
480 can_hover => 1,
481 ellipsise => 2,
482 align => -1,
483 on_button_down => $button_cb,
484 ;
485 my $desc = CFPlus::Item::desc_string $self;
486 $self->{desc_widget}{bg} = $bg;
487 $self->{desc_widget}->set_text ($desc);
488 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
489
490 $self->{weight_widget} ||= new CFPlus::UI::Label
491 can_events => 1,
492 can_hover => 1,
493 ellipsise => 0,
494 align => 0,
495 on_button_down => $button_cb,
496 ;
497 $self->{weight_widget}{bg} = $bg;
498 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
499 $self->{weight_widget}->set_tooltip (
500 "<b>Weight</b>.\n"
501 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
502 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
503 . "\n\n$tooltip_std"
504 );
505}
506 248
5071; 2491;
508 250
509=back 251=back
510 252

Diff Legend

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