… | |
… | |
12 | |
12 | |
13 | =cut |
13 | =cut |
14 | |
14 | |
15 | package CFPlus; |
15 | package CFPlus; |
16 | |
16 | |
|
|
17 | use Carp (); |
|
|
18 | |
17 | BEGIN { |
19 | BEGIN { |
18 | $VERSION = '0.2'; |
20 | $VERSION = '0.52'; |
19 | |
21 | |
20 | use XSLoader; |
22 | use XSLoader; |
21 | XSLoader::load "CFPlus", $VERSION; |
23 | XSLoader::load "CFPlus", $VERSION; |
22 | } |
24 | } |
23 | |
25 | |
|
|
26 | BEGIN { |
|
|
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 | } |
|
|
34 | |
24 | use utf8; |
35 | use utf8; |
25 | |
36 | |
26 | use Carp (); |
|
|
27 | use AnyEvent (); |
37 | use AnyEvent (); |
28 | use BerkeleyDB; |
38 | use BerkeleyDB; |
29 | use Pod::POM (); |
39 | use Pod::POM (); |
30 | use Scalar::Util (); |
40 | use Scalar::Util (); |
31 | use Storable (); # finally |
41 | use Storable (); # finally |
… | |
… | |
52 | s/</</g; |
62 | s/</</g; |
53 | |
63 | |
54 | $_ |
64 | $_ |
55 | } |
65 | } |
56 | |
66 | |
|
|
67 | sub socketpipe() { |
|
|
68 | socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC |
|
|
69 | or die "cannot establish bidiretcional pipe: $!\n"; |
|
|
70 | |
|
|
71 | ($fh1, $fh2) |
|
|
72 | } |
|
|
73 | |
|
|
74 | sub background(&) { |
|
|
75 | my ($cb) = @_; |
|
|
76 | |
|
|
77 | my ($fh_r, $fh_w) = CFPlus::socketpipe; |
|
|
78 | |
|
|
79 | my $pid = fork; |
|
|
80 | |
|
|
81 | if (defined $pid && !$pid) { |
|
|
82 | $SIG{__DIE__} = sub { |
|
|
83 | my $msg = $_[0]; |
|
|
84 | $msg =~ s/\n+/\n/; |
|
|
85 | warn "FATAL: $msg"; |
|
|
86 | CFPlus::_exit 99; |
|
|
87 | }; |
|
|
88 | |
|
|
89 | open STDOUT, ">&", $fh_w; |
|
|
90 | open STDERR, ">&", $fh_w; |
|
|
91 | close $fh_r; |
|
|
92 | close $fh_w; |
|
|
93 | |
|
|
94 | $| = 1; |
|
|
95 | |
|
|
96 | $cb->(); |
|
|
97 | |
|
|
98 | # win32 is fucked up, of course. exit will clean stuff up, |
|
|
99 | # which destroys our database etc. _exit will exit ALL |
|
|
100 | # forked processes, because of the dreaded fork emulation. |
|
|
101 | CFPlus::_exit 0; |
|
|
102 | } |
|
|
103 | |
|
|
104 | close $fh_w; |
|
|
105 | |
|
|
106 | my $buffer; |
|
|
107 | |
|
|
108 | Event->io (fd => $fh_r, poll => 'r', cb => sub { |
|
|
109 | unless (sysread $fh_r, $buffer, 4096, length $buffer) { |
|
|
110 | $_[0]->w->cancel; |
|
|
111 | $buffer .= "done\n"; |
|
|
112 | } |
|
|
113 | |
|
|
114 | while ($buffer =~ s/^(.*)\n//) { |
|
|
115 | my $line = $1; |
|
|
116 | utf8::decode $line; |
|
|
117 | ::message ({ |
|
|
118 | markup => "editor($pid): " . CFPlus::asxml $line, |
|
|
119 | }); |
|
|
120 | } |
|
|
121 | }); |
|
|
122 | } |
|
|
123 | |
57 | package CFPlus::Database; |
124 | package CFPlus::Database; |
58 | |
125 | |
59 | our @ISA = BerkeleyDB::Btree::; |
126 | our @ISA = BerkeleyDB::Btree::; |
60 | |
127 | |
61 | sub get($$) { |
128 | sub get($$) { |
… | |
… | |
69 | my %DB_SYNC; |
136 | my %DB_SYNC; |
70 | |
137 | |
71 | sub put($$$) { |
138 | sub put($$$) { |
72 | my ($db, $key, $data) = @_; |
139 | my ($db, $key, $data) = @_; |
73 | |
140 | |
|
|
141 | my $hkey = $db + 0; |
|
|
142 | Scalar::Util::weaken $db; |
74 | $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); |
143 | $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub { |
|
|
144 | delete $DB_SYNC{$hkey}; |
|
|
145 | $db->db_sync if $db; |
|
|
146 | }); |
75 | |
147 | |
76 | $db->db_put ($key => $data) |
148 | $db->db_put ($key => $data) |
77 | } |
149 | } |
78 | |
150 | |
79 | package CFPlus; |
151 | package CFPlus; |
… | |
… | |
123 | open my $fh, ">:utf8", $file |
195 | open my $fh, ">:utf8", $file |
124 | or return; |
196 | or return; |
125 | print $fh to_json $::CFG; |
197 | print $fh to_json $::CFG; |
126 | } |
198 | } |
127 | |
199 | |
|
|
200 | sub http_proxy { |
|
|
201 | my @proxy = win32_proxy_info; |
|
|
202 | |
|
|
203 | if (@proxy) { |
|
|
204 | "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0] |
|
|
205 | } elsif (exists $ENV{http_proxy}) { |
|
|
206 | $ENV{http_proxy} |
|
|
207 | } else { |
|
|
208 | () |
|
|
209 | } |
|
|
210 | } |
|
|
211 | |
|
|
212 | sub set_proxy { |
|
|
213 | my $proxy = http_proxy |
|
|
214 | or return; |
|
|
215 | |
|
|
216 | $ENV{http_proxy} = $proxy; |
|
|
217 | } |
|
|
218 | |
128 | our $DB_ENV; |
219 | our $DB_ENV; |
|
|
220 | our $DB_STATE; |
|
|
221 | |
|
|
222 | sub db_table($) { |
|
|
223 | my ($table) = @_; |
|
|
224 | |
|
|
225 | $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
|
|
226 | |
|
|
227 | new CFPlus::Database |
|
|
228 | -Env => $DB_ENV, |
|
|
229 | -Filename => $table, |
|
|
230 | # -Filename => "database", |
|
|
231 | # -Subname => $table, |
|
|
232 | -Property => DB_CHKSUM, |
|
|
233 | -Flags => DB_CREATE | DB_UPGRADE, |
|
|
234 | or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" |
|
|
235 | } |
129 | |
236 | |
130 | { |
237 | { |
131 | use strict; |
238 | use strict; |
132 | |
239 | |
133 | mkdir "$Crossfire::VARDIR/cfplus", 0777; |
240 | mkdir "$Crossfire::VARDIR/cfplus", 0777; |
… | |
… | |
142 | # -ErrPrefix => "DATABASE", |
249 | # -ErrPrefix => "DATABASE", |
143 | -Verbose => 1, |
250 | -Verbose => 1, |
144 | -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, |
251 | -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, |
145 | -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, |
252 | -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, |
146 | or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; |
253 | or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; |
147 | } |
|
|
148 | |
254 | |
149 | sub db_table($) { |
255 | $DB_STATE = db_table "state"; |
150 | my ($table) = @_; |
|
|
151 | |
|
|
152 | $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
|
|
153 | |
|
|
154 | new CFPlus::Database |
|
|
155 | -Env => $DB_ENV, |
|
|
156 | -Filename => $table, |
|
|
157 | # -Filename => "database", |
|
|
158 | # -Subname => $table, |
|
|
159 | -Property => DB_CHKSUM, |
|
|
160 | -Flags => DB_CREATE | DB_UPGRADE, |
|
|
161 | or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" |
|
|
162 | } |
256 | } |
163 | |
257 | |
164 | package CFPlus::Layout; |
258 | package CFPlus::Layout; |
165 | |
259 | |
166 | $CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { |
260 | $CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { |
… | |
… | |
209 | } |
303 | } |
210 | |
304 | |
211 | sub do_n_dialog { |
305 | sub do_n_dialog { |
212 | my ($cb) = @_; |
306 | my ($cb) = @_; |
213 | |
307 | |
214 | my $w = new CFPlus::UI::FancyFrame |
308 | my $w = new CFPlus::UI::Toplevel |
215 | on_delete => sub { $_[0]->destroy; 1 }, |
309 | on_delete => sub { $_[0]->destroy; 1 }, |
216 | has_close_button => 1, |
310 | has_close_button => 1, |
217 | ; |
311 | ; |
218 | |
312 | |
219 | $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center"); |
313 | $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center"); |
… | |
… | |
281 | &::open_string_query ("Text to inscribe", sub { |
375 | &::open_string_query ("Text to inscribe", sub { |
282 | my ($entry, $txt) = @_; |
376 | my ($entry, $txt) = @_; |
283 | $::CONN->send ("mark ". pack "N", $self->{tag}); |
377 | $::CONN->send ("mark ". pack "N", $self->{tag}); |
284 | $::CONN->send ("command use_skill inscription $txt"); |
378 | $::CONN->send ("command use_skill inscription $txt"); |
285 | }); |
379 | }); |
|
|
380 | } |
|
|
381 | ], |
|
|
382 | ["rename", # first try of an easier use of flint&steel |
|
|
383 | sub { |
|
|
384 | &::open_string_query ("Rename item to:", sub { |
|
|
385 | my ($entry, $txt) = @_; |
|
|
386 | $::CONN->send ("mark ". pack "N", $self->{tag}); |
|
|
387 | $::CONN->send ("command rename to <$txt>"); |
|
|
388 | }, $self->{name}, |
|
|
389 | "If you input no name or erase the current custom name, the custom name will be unset"); |
286 | } |
390 | } |
287 | ], |
391 | ], |
288 | ["apply", sub { $::CONN->send ("apply $self->{tag}") }], |
392 | ["apply", sub { $::CONN->send ("apply $self->{tag}") }], |
289 | ( |
393 | ( |
290 | $self->{flags} & F_LOCKED |
394 | $self->{flags} & F_LOCKED |