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.83 by root, Wed May 31 07:40:33 2006 UTC vs.
Revision 1.88 by root, Mon Jun 5 05:31:13 2006 UTC

… …
24use utf8; 24use utf8;
25 25
26use Carp (); 26use Carp ();
27use AnyEvent (); 27use AnyEvent ();
28use BerkeleyDB; 28use BerkeleyDB;
29use Pod::POM;
29 30
30sub find_rcfile($) { 31sub find_rcfile($) {
31 my $path; 32 my $path;
32 33
33 for (grep !ref, @INC) { 34 for (grep !ref, @INC) {
… …
68 } 69 }
69 70
70 close CFG; 71 close CFG;
71} 72}
72 73
73mkdir "$Crossfire::VARDIR/cfplus", 0777; 74my %POD_CACHE;
75
76sub load_pod($) {
77 $POD_CACHE{$_[0]} ||= do {
78 my $pod = do {
79 local $/;
80 open my $pod, "<:utf8", $_[0]
81 or die "$_[0]: $!";
82 <$pod>
83 };
84
85 Pod::POM->new->parse_text ($pod)
86 }
87}
74 88
75our $DB_ENV; 89our $DB_ENV;
76 90
77{ 91{
78 use strict; 92 use strict;
79 93
94 mkdir "$Crossfire::VARDIR/cfplus", 0777;
80 my $recover = $BerkeleyDB::db_version >= 4.4 95 my $recover = $BerkeleyDB::db_version >= 4.4
81 ? eval "DB_REGISTER | DB_RECOVER" 96 ? eval "DB_REGISTER | DB_RECOVER"
82 : 0; 97 : 0;
83 98
84 $DB_ENV = new BerkeleyDB::Env 99 $DB_ENV = new BerkeleyDB::Env
… …
203 218
204package CFClient::Item; 219package CFClient::Item;
205 220
206use strict; 221use strict;
207use Crossfire::Protocol::Constants; 222use Crossfire::Protocol::Constants;
223
224my $last_enter_count = 1;
208 225
209sub desc_string { 226sub desc_string {
210 my ($self) = @_; 227 my ($self) = @_;
211 228
212 my $desc = 229 my $desc =
… …
238 my $weight = ($self->{nrof} || 1) * $self->{weight}; 255 my $weight = ($self->{nrof} || 1) * $self->{weight};
239 256
240 $weight < 0 ? "?" : $weight * 0.001 257 $weight < 0 ? "?" : $weight * 0.001
241} 258}
242 259
260sub do_n_dialog {
261 my ($cb) = @_;
262
263 my $w = new CFClient::UI::FancyFrame;
264 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
265 $vb->add (new CFClient::UI::Label text => "Enter item count:");
266 $vb->add (my $entry = new CFClient::UI::Entry
267 text => $last_enter_count,
268 on_activate => sub {
269 my ($entry) = @_;
270 $last_enter_count = $entry->get_text;
271 $cb->($last_enter_count);
272 $w->hide;
273 $w = undef;
274 }
275 );
276 $entry->focus_in;
277 $w->show;
278
279}
280
243sub update_widgets { 281sub update_widgets {
244 my ($self) = @_; 282 my ($self) = @_;
245 283
246 my $button_cb = sub { 284 my $button_cb = sub {
247 my (undef, $ev, $x, $y) = @_; 285 my (undef, $ev, $x, $y) = @_;
248 286
287 my $targ = $::CONN->{player}{tag};
288
289 if ($self->{container} == $::CONN->{player}{tag}) {
290 $targ = $::CONN->{open_container};
291 }
292
249 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 293 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
250 my $targ = $::CONN->{player}{tag};
251
252 if ($self->{container} == $::CONN->{player}{tag}) {
253 $targ = $::CONN->{open_container};
254 }
255
256 $::CONN->send ("move $targ $self->{tag} 0") 294 $::CONN->send ("move $targ $self->{tag} 0")
257 if $targ || !($self->{flags} & F_LOCKED); 295 if $targ || !($self->{flags} & F_LOCKED);
296 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
297 $self->{flags} & F_LOCKED
298 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
299 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
258 } elsif ($ev->{button} == 1) { 300 } elsif ($ev->{button} == 1) {
259 $::CONN->send ("examine $self->{tag}"); 301 $::CONN->send ("examine $self->{tag}");
260 } elsif ($ev->{button} == 2) { 302 } elsif ($ev->{button} == 2) {
261 $::CONN->send ("apply $self->{tag}"); 303 $::CONN->send ("apply $self->{tag}");
262 } elsif ($ev->{button} == 3) { 304 } elsif ($ev->{button} == 3) {
… …
270 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 312 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
271 ) 313 )
272 : ( 314 : (
273 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 315 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
274 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], 316 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
317 ["move n",
318 sub {
319 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
320 }
321 ]
275 ) 322 )
276 ), 323 ),
277 ); 324 );
278 325
279 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 326 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
… …
284 331
285 my $tooltip_std = "<small>" 332 my $tooltip_std = "<small>"
286 . "Left click - examine item\n" 333 . "Left click - examine item\n"
287 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 334 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
288 . "Middle click - apply\n" 335 . "Middle click - apply\n"
336 . "Shift-Middle click - lock/unlock\n"
289 . "Right click - further options" 337 . "Right click - further options"
290 . "</small>\n"; 338 . "</small>\n";
291 339
292 $self->{face_widget} ||= new CFClient::UI::Face 340 $self->{face_widget} ||= new CFClient::UI::Face
293 can_events => 1, 341 can_events => 1,
… …
335} 383}
336 384
337package CFClient::Binder; 385package CFClient::Binder;
338 386
339my @ALLOWED_MODIFIER_KEYS = ( 387my @ALLOWED_MODIFIER_KEYS = (
340 (CFClient::SDLK_LSHIFT), 388 CFClient::SDLK_LSHIFT,
341 (CFClient::SDLK_LCTRL ), 389 CFClient::SDLK_LCTRL ,
342 (CFClient::SDLK_LALT ), 390 CFClient::SDLK_LALT ,
343 (CFClient::SDLK_LMETA ), 391 CFClient::SDLK_LMETA ,
344 392
345 (CFClient::SDLK_RSHIFT), 393 CFClient::SDLK_RSHIFT,
346 (CFClient::SDLK_RCTRL ), 394 CFClient::SDLK_RCTRL ,
347 (CFClient::SDLK_RALT ), 395 CFClient::SDLK_RALT ,
348 (CFClient::SDLK_RMETA ), 396 CFClient::SDLK_RMETA ,
349); 397);
350 398
351my %ALLOWED_MODIFIERS = ( 399my %ALLOWED_MODIFIERS = (
352 (CFClient::KMOD_LSHIFT) => "LSHIFT", 400 CFClient::KMOD_LSHIFT => "LSHIFT",
353 (CFClient::KMOD_LCTRL ) => "LCTRL", 401 CFClient::KMOD_LCTRL => "LCTRL",
354 (CFClient::KMOD_LALT ) => "LALT", 402 CFClient::KMOD_LALT => "LALT",
355 (CFClient::KMOD_LMETA ) => "LMETA", 403 CFClient::KMOD_LMETA => "LMETA",
356 404
357 (CFClient::KMOD_RSHIFT) => "RSHIFT", 405 CFClient::KMOD_RSHIFT => "RSHIFT",
358 (CFClient::KMOD_RCTRL ) => "RCTRL", 406 CFClient::KMOD_RCTRL => "RCTRL",
359 (CFClient::KMOD_RALT ) => "RALT", 407 CFClient::KMOD_RALT => "RALT",
360 (CFClient::KMOD_RMETA ) => "RMETA", 408 CFClient::KMOD_RMETA => "RMETA",
361); 409);
362 410
363my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/; 411my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
364my @DIRECT_BIND_KEYS = ( 412my @DIRECT_BIND_KEYS = (
365 CFClient::SDLK_F1, 413 CFClient::SDLK_F1,
… …
439 $mods .= "+" if $mods ne ''; 487 $mods .= "+" if $mods ne '';
440 488
441 return $mods . CFClient::SDL_GetKeyName ($sym); 489 return $mods . CFClient::SDL_GetKeyName ($sym);
442} 490}
443 491
492package CFClient::Pickup;
493# some pickup constants
494sub PU_NOTHING { 0x00000000 }
495
496sub PU_DEBUG { 0x10000000 }
497sub PU_INHIBIT { 0x20000000 }
498sub PU_STOP { 0x40000000 }
499sub PU_NEWMODE { 0x80000000 }
500
501sub PU_RATIO { 0x0000000F }
502
503sub PU_FOOD { 0x00000010 }
504sub PU_DRINK { 0x00000020 }
505sub PU_VALUABLES { 0x00000040 }
506sub PU_BOW { 0x00000080 }
507
508sub PU_ARROW { 0x00000100 }
509sub PU_HELMET { 0x00000200 }
510sub PU_SHIELD { 0x00000400 }
511sub PU_ARMOUR { 0x00000800 }
512
513sub PU_BOOTS { 0x00001000 }
514sub PU_GLOVES { 0x00002000 }
515sub PU_CLOAK { 0x00004000 }
516sub PU_KEY { 0x00008000 }
517
518sub PU_MISSILEWEAPON { 0x00010000 }
519sub PU_ALLWEAPON { 0x00020000 }
520sub PU_MAGICAL { 0x00040000 }
521sub PU_POTION { 0x00080000 }
522
523sub PU_SPELLBOOK { 0x00100000 }
524sub PU_SKILLSCROLL { 0x00200000 }
525sub PU_READABLES { 0x00400000 }
526sub PU_MAGIC_DEVICE { 0x00800000 }
527
528sub PU_NOT_CURSED { 0x01000000 }
529
530sub PU_JEWELS { 0x02000000 }
531
532
4441; 5331;
445 534
446=back 535=back
447 536
448=head1 AUTHOR 537=head1 AUTHOR

Diff Legend

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