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.123 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.135 by root, Thu Dec 7 15:57:13 2006 UTC

… …
15package CFPlus; 15package CFPlus;
16 16
17use Carp (); 17use Carp ();
18 18
19BEGIN { 19BEGIN {
20 $VERSION = '0.52'; 20 $VERSION = '0.97';
21 21
22 use XSLoader; 22 use XSLoader;
23 XSLoader::load "CFPlus", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
24}
25
26BEGIN {
27 $SIG{__DIE__} = sub {
28 return if CFPlus::in_destruct;
29 #CFPlus::fatal $_[0];#d#
30 CFPlus::error Carp::longmess $_[0];#d#
31 die;#d#
32 };
33} 24}
34 25
35use utf8; 26use utf8;
36 27
37use AnyEvent (); 28use AnyEvent ();
38use BerkeleyDB; 29use BerkeleyDB;
39use Pod::POM (); 30use Pod::POM ();
40use Scalar::Util (); 31use Scalar::Util ();
32use File::Path ();
41use Storable (); # finally 33use Storable (); # finally
34
35BEGIN {
36 use Crossfire::Protocol::Base ();
37 *to_json = \&Crossfire::Protocol::Base::to_json;
38 *from_json = \&Crossfire::Protocol::Base::from_json;
39}
42 40
43=item guard { BLOCK } 41=item guard { BLOCK }
44 42
45Returns an object that executes the given block as soon as it is destroyed. 43Returns an object that executes the given block as soon as it is destroyed.
46 44
… …
50 bless \(my $cb = $_[0]), "CFPlus::Guard" 48 bless \(my $cb = $_[0]), "CFPlus::Guard"
51} 49}
52 50
53sub CFPlus::Guard::DESTROY { 51sub CFPlus::Guard::DESTROY {
54 ${$_[0]}->() 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
55} 63}
56 64
57sub asxml($) { 65sub asxml($) {
58 local $_ = $_[0]; 66 local $_ = $_[0];
59 67
… …
69 or die "cannot establish bidiretcional pipe: $!\n"; 77 or die "cannot establish bidiretcional pipe: $!\n";
70 78
71 ($fh1, $fh2) 79 ($fh1, $fh2)
72} 80}
73 81
74sub background(&) { 82sub background(&;&) {
75 my ($cb) = @_; 83 my ($bg, $cb) = @_;
76 84
77 my ($fh_r, $fh_w) = CFPlus::socketpipe; 85 my ($fh_r, $fh_w) = CFPlus::socketpipe;
78 86
79 my $pid = fork; 87 my $pid = fork;
80 88
81 if (defined $pid && !$pid) { 89 if (defined $pid && !$pid) {
82 $SIG{__DIE__} = sub { 90 local $SIG{__DIE__};
83 my $msg = $_[0];
84 $msg =~ s/\n+/\n/;
85 warn "FATAL: $msg";
86 CFPlus::_exit 99;
87 };
88 91
89 open STDOUT, ">&", $fh_w; 92 open STDOUT, ">&", $fh_w;
90 open STDERR, ">&", $fh_w; 93 open STDERR, ">&", $fh_w;
91 close $fh_r; 94 close $fh_r;
92 close $fh_w; 95 close $fh_w;
93 96
94 $| = 1; 97 $| = 1;
95 98
96 $cb->(); 99 eval { $bg->() };
100
101 if ($@) {
102 my $msg = $@;
103 $msg =~ s/\n+/\n/;
104 warn "FATAL: $msg";
105 CFPlus::_exit 1;
106 }
97 107
98 # win32 is fucked up, of course. exit will clean stuff up, 108 # win32 is fucked up, of course. exit will clean stuff up,
99 # which destroys our database etc. _exit will exit ALL 109 # which destroys our database etc. _exit will exit ALL
100 # forked processes, because of the dreaded fork emulation. 110 # forked processes, because of the dreaded fork emulation.
101 CFPlus::_exit 0; 111 CFPlus::_exit 0;
102 } 112 }
103 113
104 close $fh_w; 114 close $fh_w;
105 115
106 my $buffer; 116 my $buffer;
107 117
108 Event->io (fd => $fh_r, poll => 'r', cb => sub { 118 my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
109 unless (sysread $fh_r, $buffer, 4096, length $buffer) { 119 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
110 $_[0]->w->cancel; 120 undef $w;
111 $buffer .= "done\n"; 121 $cb->();
122 return;
112 } 123 }
113 124
114 while ($buffer =~ s/^(.*)\n//) { 125 while ($buffer =~ s/^(.*)\n//) {
115 my $line = $1; 126 my $line = $1;
127 $line =~ s/\s+$//;
116 utf8::decode $line; 128 utf8::decode $line;
129 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
130 $cb->(from_json $1);
131 } else {
117 ::message ({ 132 ::message ({
118 markup => "editor($pid): " . CFPlus::asxml $line, 133 markup => "background($pid): " . CFPlus::asxml $line,
134 });
119 }); 135 }
120 } 136 }
121 }); 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";
122} 147}
123 148
124package CFPlus::Database; 149package CFPlus::Database;
125 150
126our @ISA = BerkeleyDB::Btree::; 151our @ISA = BerkeleyDB::Btree::;
… …
157 $path = "$_/CFPlus/resources/$_[0]"; 182 $path = "$_/CFPlus/resources/$_[0]";
158 return $path if -r $path; 183 return $path if -r $path;
159 } 184 }
160 185
161 die "FATAL: can't find required file $_[0]\n"; 186 die "FATAL: can't find required file $_[0]\n";
162}
163
164BEGIN {
165 use Crossfire::Protocol::Base ();
166 *to_json = \&Crossfire::Protocol::Base::to_json;
167 *from_json = \&Crossfire::Protocol::Base::from_json;
168} 187}
169 188
170sub read_cfg { 189sub read_cfg {
171 my ($file) = @_; 190 my ($file) = @_;
172 191
… …
214 or return; 233 or return;
215 234
216 $ENV{http_proxy} = $proxy; 235 $ENV{http_proxy} = $proxy;
217} 236}
218 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
258}
259
219our $DB_ENV; 260our $DB_ENV;
220our $DB_STATE; 261our $DB_STATE;
221 262
222sub db_table($) { 263sub db_table($) {
223 my ($table) = @_; 264 my ($table) = @_;
… …
232 -Property => DB_CHKSUM, 273 -Property => DB_CHKSUM,
233 -Flags => DB_CREATE | DB_UPGRADE, 274 -Flags => DB_CREATE | DB_UPGRADE,
234 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 275 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
235} 276}
236 277
237{ 278our $DB_HOME = "$Crossfire::VARDIR/cfplus";
279
280sub open_db {
238 use strict; 281 use strict;
239 282
240 mkdir "$Crossfire::VARDIR/cfplus", 0777; 283 mkdir $DB_HOME, 0777;
241 my $recover = $BerkeleyDB::db_version >= 4.4 284 my $recover = $BerkeleyDB::db_version >= 4.4
242 ? eval "DB_REGISTER | DB_RECOVER" 285 ? eval "DB_REGISTER | DB_RECOVER"
243 : 0; 286 : 0;
244 287
245 $DB_ENV = new BerkeleyDB::Env 288 $DB_ENV = new BerkeleyDB::Env
246 -Home => "$Crossfire::VARDIR/cfplus", 289 -Home => $DB_HOME,
247 -Cachesize => 1_000_000, 290 -Cachesize => 1_000_000,
248 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", 291 -ErrFile => "$DB_HOME/errorlog.txt",
249# -ErrPrefix => "DATABASE", 292# -ErrPrefix => "DATABASE",
250 -Verbose => 1, 293 -Verbose => 1,
251 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, 294 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
252 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 295 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
253 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; 296 or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error";
254 297
255 $DB_STATE = db_table "state"; 298 $DB_STATE = db_table "state";
299
300 1
301}
302
303unless (eval { open_db }) {
304 File::Path::rmtree $DB_HOME;
305 open_db;
256} 306}
257 307
258package CFPlus::Layout; 308package CFPlus::Layout;
259 309
260$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 310$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
… …
358 } elsif ($ev->{button} == 3) { 408 } elsif ($ev->{button} == 3) {
359 my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop'; 409 my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
360 if ($self->{container} == $::CONN->{open_container}) { 410 if ($self->{container} == $::CONN->{open_container}) {
361 $move_prefix = "take"; 411 $move_prefix = "take";
362 } 412 }
413
414 my $shortname = CFPlus::shorten $self->{name}, 14;
363 415
364 my @menu_items = ( 416 my @menu_items = (
365 ["examine", sub { $::CONN->send ("examine $self->{tag}") }], 417 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
366 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 418 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
367 ["ignite/thaw", # first try of an easier use of flint&steel 419 ["ignite/thaw", # first try of an easier use of flint&steel
… …
403 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) 455 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
404 } 456 }
405 ] 457 ]
406 ) 458 )
407 ), 459 ),
460 ["bind <i>apply $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["apply $self->{name}"]) }],
408 ); 461 );
409 462
410 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 463 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
411 } 464 }
412 465

Diff Legend

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