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.135 by root, Thu Dec 7 15:57:13 2006 UTC vs.
Revision 1.167 by root, Wed Dec 26 19:11:09 2007 UTC

… …
15package CFPlus; 15package CFPlus;
16 16
17use Carp (); 17use Carp ();
18 18
19BEGIN { 19BEGIN {
20 $VERSION = '0.97'; 20 $VERSION = '0.9962';
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 ();
32use File::Path (); 30use File::Path ();
33use Storable (); # finally 31use Storable (); # finally
34 32use Fcntl ();
35BEGIN { 33use JSON::XS qw(encode_json decode_json);
36 use Crossfire::Protocol::Base ();
37 *to_json = \&Crossfire::Protocol::Base::to_json;
38 *from_json = \&Crossfire::Protocol::Base::from_json;
39}
40 34
41=item guard { BLOCK } 35=item guard { BLOCK }
42 36
43Returns 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.
44 38
… …
72 $_ 66 $_
73} 67}
74 68
75sub socketpipe() { 69sub socketpipe() {
76 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
77 or die "cannot establish bidiretcional pipe: $!\n"; 71 or die "cannot establish bidirectional pipe: $!\n";
78 72
79 ($fh1, $fh2) 73 ($fh1, $fh2)
80} 74}
81 75
82sub background(&;&) { 76sub background(&;&) {
… …
125 while ($buffer =~ s/^(.*)\n//) { 119 while ($buffer =~ s/^(.*)\n//) {
126 my $line = $1; 120 my $line = $1;
127 $line =~ s/\s+$//; 121 $line =~ s/\s+$//;
128 utf8::decode $line; 122 utf8::decode $line;
129 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 123 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
130 $cb->(from_json $1); 124 $cb->(JSON::XS->new->allow_nonref->decode ($1));
131 } else { 125 } else {
132 ::message ({ 126 ::message ({
133 markup => "background($pid): " . CFPlus::asxml $line, 127 markup => "background($pid): " . CFPlus::asxml $line,
134 }); 128 });
135 } 129 }
… …
138} 132}
139 133
140sub background_msg { 134sub background_msg {
141 my ($msg) = @_; 135 my ($msg) = @_;
142 136
143 $msg = "\x{e877}json_msg " . to_json $msg; 137 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
144 $msg =~ s/\n//g; 138 $msg =~ s/\n//g;
145 utf8::encode $msg; 139 utf8::encode $msg;
146 print $msg, "\n"; 140 print $msg, "\n";
147} 141}
148 142
149package CFPlus::Database;
150
151our @ISA = BerkeleyDB::Btree::;
152
153sub get($$) {
154 my $data;
155
156 $_[0]->db_get ($_[1], $data) == 0
157 ? $data
158 : ()
159}
160
161my %DB_SYNC;
162
163sub put($$$) {
164 my ($db, $key, $data) = @_;
165
166 my $hkey = $db + 0;
167 Scalar::Util::weaken $db;
168 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
169 delete $DB_SYNC{$hkey};
170 $db->db_sync if $db;
171 });
172
173 $db->db_put ($key => $data)
174}
175
176package CFPlus; 143package CFPlus;
177 144
178sub find_rcfile($) { 145sub find_rcfile($) {
179 my $path; 146 my $path;
180 147
… …
193 or return; 160 or return;
194 161
195 local $/; 162 local $/;
196 my $CFG = <$fh>; 163 my $CFG = <$fh>;
197 164
198 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
199 require YAML;
200 utf8::decode $CFG;
201 $::CFG = YAML::Load ($CFG);
202 } elsif ($CFG =~ /^\{/) {
203 $::CFG = from_json $CFG; 165 $::CFG = decode_json $CFG;
204 } else {
205 $::CFG = eval $CFG; ## todo comaptibility cruft
206 }
207} 166}
208 167
209sub write_cfg { 168sub write_cfg {
210 my ($file) = @_; 169 my ($file) = @_;
211 170
212 $::CFG->{VERSION} = $::VERSION; 171 $::CFG->{VERSION} = $::VERSION;
213 172
214 open my $fh, ">:utf8", $file 173 open my $fh, ">:utf8", $file
215 or return; 174 or return;
216 print $fh to_json $::CFG; 175 print $fh encode_json $::CFG;
217} 176}
218 177
219sub http_proxy { 178sub http_proxy {
220 my @proxy = win32_proxy_info; 179 my @proxy = win32_proxy_info;
221 180
… …
255 and die $res->status_line; 214 and die $res->status_line;
256 215
257 $res 216 $res
258} 217}
259 218
260our $DB_ENV; 219sub fh_nonblocking($$) {
261our $DB_STATE;
262
263sub db_table($) {
264 my ($table) = @_; 220 my ($fh, $nb) = @_;
265 221
266 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 222 if ($^O eq "MSWin32") {
267 223 $nb = (! ! $nb) + 0;
268 new CFPlus::Database 224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
269 -Env => $DB_ENV, 225 } else {
270 -Filename => $table, 226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
271# -Filename => "database",
272# -Subname => $table,
273 -Property => DB_CHKSUM,
274 -Flags => DB_CREATE | DB_UPGRADE,
275 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
276}
277
278our $DB_HOME = "$Crossfire::VARDIR/cfplus";
279
280sub open_db {
281 use strict;
282
283 mkdir $DB_HOME, 0777;
284 my $recover = $BerkeleyDB::db_version >= 4.4
285 ? eval "DB_REGISTER | DB_RECOVER"
286 : 0;
287
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";
297
298 $DB_STATE = db_table "state";
299
300 1 227 }
301}
302 228
303unless (eval { open_db }) {
304 File::Path::rmtree $DB_HOME;
305 open_db;
306} 229}
307 230
308package CFPlus::Layout; 231package CFPlus::Layout;
309 232
233$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Layout"} = sub {
234 glyph_cache_restore;
235};
236
310$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 237$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
311 reset_glyph_cache; 238 glyph_cache_backup;
312}; 239};
313
314package CFPlus::Item;
315
316use strict;
317use Crossfire::Protocol::Constants;
318
319my $last_enter_count = 1;
320
321sub desc_string {
322 my ($self) = @_;
323
324 my $desc =
325 $self->{nrof} < 2
326 ? $self->{name}
327 : "$self->{nrof} × $self->{name_pl}";
328
329 $self->{flags} & F_OPEN
330 and $desc .= " (open)";
331 $self->{flags} & F_APPLIED
332 and $desc .= " (applied)";
333 $self->{flags} & F_UNPAID
334 and $desc .= " (unpaid)";
335 $self->{flags} & F_MAGIC
336 and $desc .= " (magic)";
337 $self->{flags} & F_CURSED
338 and $desc .= " (cursed)";
339 $self->{flags} & F_DAMNED
340 and $desc .= " (damned)";
341 $self->{flags} & F_LOCKED
342 and $desc .= " *";
343
344 $desc
345}
346
347sub weight_string {
348 my ($self) = @_;
349
350 my $weight = ($self->{nrof} || 1) * $self->{weight};
351
352 $weight < 0 ? "?" : $weight * 0.001
353}
354
355sub do_n_dialog {
356 my ($cb) = @_;
357
358 my $w = new CFPlus::UI::Toplevel
359 on_delete => sub { $_[0]->destroy; 1 },
360 has_close_button => 1,
361 ;
362
363 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
364 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
365 $vb->add (my $entry = new CFPlus::UI::Entry
366 text => $last_enter_count,
367 on_activate => sub {
368 my ($entry) = @_;
369 $last_enter_count = $entry->get_text;
370 $cb->($last_enter_count);
371 $w->hide;
372 $w->destroy;
373
374 0
375 },
376 on_escape => sub { $w->destroy; 1 },
377 );
378 $entry->grab_focus;
379 $w->show;
380}
381
382sub update_widgets {
383 my ($self) = @_;
384
385 # necessary to avoid cyclic references
386 Scalar::Util::weaken $self;
387
388 my $button_cb = sub {
389 my (undef, $ev, $x, $y) = @_;
390
391 my $targ = $::CONN->{player}{tag};
392
393 if ($self->{container} == $::CONN->{player}{tag}) {
394 $targ = $::CONN->{open_container};
395 }
396
397 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
398 $::CONN->send ("move $targ $self->{tag} 0")
399 if $targ || !($self->{flags} & F_LOCKED);
400 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
401 $self->{flags} & F_LOCKED
402 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
403 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
404 } elsif ($ev->{button} == 1) {
405 $::CONN->send ("examine $self->{tag}");
406 } elsif ($ev->{button} == 2) {
407 $::CONN->send ("apply $self->{tag}");
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
416 my @menu_items = (
417 ["examine", sub { $::CONN->send ("examine $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 ],
444 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
445 (
446 $self->{flags} & F_LOCKED
447 ? (
448 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
449 )
450 : (
451 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
452 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
453 ["$move_prefix &lt;n&gt;",
454 sub {
455 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
456 }
457 ]
458 )
459 ),
460 ["bind <i>apply $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["apply $self->{name}"]) }],
461 );
462
463 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
464 }
465
466 1
467 };
468
469 my $tooltip_std = "<small>"
470 . "Left click - examine item\n"
471 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
472 . "Middle click - apply\n"
473 . "Shift-Middle click - lock/unlock\n"
474 . "Right click - further options"
475 . "</small>\n";
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
481 $self->{face_widget} ||= new CFPlus::UI::Face
482 can_events => 1,
483 can_hover => 1,
484 anim => $self->{anim},
485 animspeed => $self->{animspeed}, # TODO# must be set at creation time
486 on_button_down => $button_cb,
487 ;
488 $self->{face_widget}{bg} = $bg;
489 $self->{face_widget}{face} = $self->{face};
490 $self->{face_widget}{anim} = $self->{anim};
491 $self->{face_widget}{animspeed} = $self->{animspeed};
492 $self->{face_widget}->set_tooltip (
493 "<b>Face/Animation.</b>\n"
494 . "Item uses face #$self->{face}. "
495 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
496 . "\n\n$tooltip_std"
497 );
498
499 $self->{desc_widget} ||= new CFPlus::UI::Label
500 can_events => 1,
501 can_hover => 1,
502 ellipsise => 2,
503 align => -1,
504 on_button_down => $button_cb,
505 ;
506 my $desc = CFPlus::Item::desc_string $self;
507 $self->{desc_widget}{bg} = $bg;
508 $self->{desc_widget}->set_text ($desc);
509 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
510
511 $self->{weight_widget} ||= new CFPlus::UI::Label
512 can_events => 1,
513 can_hover => 1,
514 ellipsise => 0,
515 align => 0,
516 on_button_down => $button_cb,
517 ;
518 $self->{weight_widget}{bg} = $bg;
519 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
520 $self->{weight_widget}->set_tooltip (
521 "<b>Weight</b>.\n"
522 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
523 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
524 . "\n\n$tooltip_std"
525 );
526}
527 240
5281; 2411;
529 242
530=back 243=back
531 244

Diff Legend

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