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

Diff Legend

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