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.72 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.86 by elmex, Fri Jun 2 16:27:27 2006 UTC

… …
68 } 68 }
69 69
70 close CFG; 70 close CFG;
71} 71}
72 72
73mkdir "$Crossfire::VARDIR/pclient", 0777; 73mkdir "$Crossfire::VARDIR/cfplus", 0777;
74 74
75our $DB_ENV;
76
77{
78 use strict;
79
80 my $recover = $BerkeleyDB::db_version >= 4.4
81 ? eval "DB_REGISTER | DB_RECOVER"
82 : 0;
83
75our $DB_ENV = new BerkeleyDB::Env 84 $DB_ENV = new BerkeleyDB::Env
76 -Home => "$Crossfire::VARDIR/pclient", 85 -Home => "$Crossfire::VARDIR/cfplus",
77 -Cachesize => 1_000_000, 86 -Cachesize => 1_000_000,
78 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 87 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
79# -ErrPrefix => "DATABASE", 88# -ErrPrefix => "DATABASE",
80 -Verbose => 1, 89 -Verbose => 1,
81 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 90 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
91 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
82 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 92 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
93}
83 94
84sub db_table($) { 95sub db_table($) {
85 my ($table) = @_; 96 my ($table) = @_;
86 97
87 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 98 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
88 99
89 new CFClient::Database 100 new CFClient::Database
90 -Env => $DB_ENV, 101 -Env => $DB_ENV,
91 -Filename => $table, 102 -Filename => $table,
92# -Filename => "database", 103# -Filename => "database",
93# -Subname => $table, 104# -Subname => $table,
94 -Property => DB_CHKSUM, 105 -Property => DB_CHKSUM,
95 -Flags => DB_CREATE | DB_UPGRADE, 106 -Flags => DB_CREATE | DB_UPGRADE,
96 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 107 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
97} 108}
98 109
99sub pod_to_pango($) { 110sub pod_to_pango($) {
100 my ($pom) = @_; 111 my ($pom) = @_;
101 112
… …
192 203
193package CFClient::Item; 204package CFClient::Item;
194 205
195use strict; 206use strict;
196use Crossfire::Protocol::Constants; 207use Crossfire::Protocol::Constants;
208
209my $last_enter_count = 1;
197 210
198sub desc_string { 211sub desc_string {
199 my ($self) = @_; 212 my ($self) = @_;
200 213
201 my $desc = 214 my $desc =
… …
227 my $weight = ($self->{nrof} || 1) * $self->{weight}; 240 my $weight = ($self->{nrof} || 1) * $self->{weight};
228 241
229 $weight < 0 ? "?" : $weight * 0.001 242 $weight < 0 ? "?" : $weight * 0.001
230} 243}
231 244
245sub do_n_dialog {
246 my ($cb) = @_;
247
248 my $w = new CFClient::UI::FancyFrame;
249 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
250 $vb->add (new CFClient::UI::Label text => "Enter item count:");
251 $vb->add (my $entry = new CFClient::UI::Entry
252 text => $last_enter_count,
253 on_activate => sub {
254 my ($entry) = @_;
255 $last_enter_count = $entry->get_text;
256 $cb->($last_enter_count);
257 $w->hide;
258 $w = undef;
259 }
260 );
261 $entry->focus_in;
262 $w->show;
263
264}
265
232sub update_widgets { 266sub update_widgets {
233 my ($self) = @_; 267 my ($self) = @_;
234 268
235 my $button_cb = sub { 269 my $button_cb = sub {
236 my (undef, $ev, $x, $y) = @_; 270 my (undef, $ev, $x, $y) = @_;
237 271
272 my $targ = $::CONN->{player}{tag};
273
274 if ($self->{container} == $::CONN->{player}{tag}) {
275 $targ = $::CONN->{open_container};
276 }
277
238 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 278 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
239 my $targ = $::CONN->{player}{tag};
240
241 if ($self->{container} == $::CONN->{player}{tag}) {
242 $targ = $::CONN->{open_container};
243 }
244
245 $::CONN->send ("move $targ $self->{tag} 0"); 279 $::CONN->send ("move $targ $self->{tag} 0")
280 if $targ || !($self->{flags} & F_LOCKED);
281 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
282 $self->{flags} & F_LOCKED
283 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
284 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
246 } elsif ($ev->{button} == 1) { 285 } elsif ($ev->{button} == 1) {
247 $::CONN->send ("examine $self->{tag}"); 286 $::CONN->send ("examine $self->{tag}");
248 } elsif ($ev->{button} == 2) { 287 } elsif ($ev->{button} == 2) {
249 $::CONN->send ("apply $self->{tag}"); 288 $::CONN->send ("apply $self->{tag}");
250 } elsif ($ev->{button} == 3) { 289 } elsif ($ev->{button} == 3) {
… …
258 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 297 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
259 ) 298 )
260 : ( 299 : (
261 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 300 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
262 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], 301 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
302 ["move n",
303 sub {
304 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
305 }
306 ]
263 ) 307 )
264 ), 308 ),
265 ); 309 );
266 310
267 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 311 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
… …
272 316
273 my $tooltip_std = "<small>" 317 my $tooltip_std = "<small>"
274 . "Left click - examine item\n" 318 . "Left click - examine item\n"
275 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 319 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
276 . "Middle click - apply\n" 320 . "Middle click - apply\n"
321 . "Shift-Middle click - lock/unlock\n"
277 . "Right click - further options" 322 . "Right click - further options"
278 . "</small>\n"; 323 . "</small>\n";
279 324
280 $self->{face_widget} ||= new CFClient::UI::Face 325 $self->{face_widget} ||= new CFClient::UI::Face
281 can_events => 1, 326 can_events => 1,
… …
320 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 365 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
321 . "\n\n$tooltip_std" 366 . "\n\n$tooltip_std"
322 ); 367 );
323} 368}
324 369
370package CFClient::Binder;
371
372my @ALLOWED_MODIFIER_KEYS = (
373 CFClient::SDLK_LSHIFT,
374 CFClient::SDLK_LCTRL ,
375 CFClient::SDLK_LALT ,
376 CFClient::SDLK_LMETA ,
377
378 CFClient::SDLK_RSHIFT,
379 CFClient::SDLK_RCTRL ,
380 CFClient::SDLK_RALT ,
381 CFClient::SDLK_RMETA ,
382);
383
384my %ALLOWED_MODIFIERS = (
385 CFClient::KMOD_LSHIFT => "LSHIFT",
386 CFClient::KMOD_LCTRL => "LCTRL",
387 CFClient::KMOD_LALT => "LALT",
388 CFClient::KMOD_LMETA => "LMETA",
389
390 CFClient::KMOD_RSHIFT => "RSHIFT",
391 CFClient::KMOD_RCTRL => "RCTRL",
392 CFClient::KMOD_RALT => "RALT",
393 CFClient::KMOD_RMETA => "RMETA",
394);
395
396my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
397my @DIRECT_BIND_KEYS = (
398 CFClient::SDLK_F1,
399 CFClient::SDLK_F2,
400 CFClient::SDLK_F3,
401 CFClient::SDLK_F4,
402 CFClient::SDLK_F5,
403 CFClient::SDLK_F6,
404 CFClient::SDLK_F7,
405 CFClient::SDLK_F8,
406 CFClient::SDLK_F9,
407 CFClient::SDLK_F10,
408 CFClient::SDLK_F11,
409 CFClient::SDLK_F12,
410 CFClient::SDLK_F13,
411 CFClient::SDLK_F14,
412 CFClient::SDLK_F15,
413);
414
415# this binding dialog asks for a key-combo to be pressed
416# and if successful it calls the $cb with $mod and $sym as args.
417sub open_binding_dialog {
418 my ($cb) = @_;
419
420 my $w = new CFClient::UI::FancyFrame
421 title => "Bind Action",
422 x => "center",
423 y => "center";
424
425 $w->add (my $vb = new CFClient::UI::VBox);
426 $vb->add (new CFClient::UI::Label
427 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
428 ."You can only bind 0-9 and F1-F15 without modifiers."
429 );
430 $vb->add (my $entry = new CFClient::UI::Entry
431 text => "",
432 on_key_down => sub {
433 my ($entry, $ev) = @_;
434
435 my $mod = $ev->{mod};
436 my $sym = $ev->{sym};
437
438 # XXX: This seems a little bit hackisch to me, but i have to ignore them
439 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
440 return;
441 }
442
443 if ($mod == CFClient::KMOD_NONE
444 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
445 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
446 {
447 $::STATUSBOX->add (
448 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
449 ." directly without modifier! It would damage the completer handling."
450 );
451 return;
452 }
453
454 $entry->focus_out;
455
456 $cb->($mod, $sym);
457
458 $w->destroy
459 });
460
461 $entry->focus_in;
462 $w->show;
463}
464
465sub keycombo_to_name {
466 my ($mod, $sym) = @_;
467
468 my $mods = join '+',
469 map { $ALLOWED_MODIFIERS{$_} }
470 grep { ($_ + 0) & ($mod + 0) }
471 keys %ALLOWED_MODIFIERS;
472 $mods .= "+" if $mods ne '';
473
474 return $mods . CFClient::SDL_GetKeyName ($sym);
475}
476
477package CFClient::Pickup;
478# some pickup constants
479sub PU_NOTHING { 0x00000000 }
480
481sub PU_DEBUG { 0x10000000 }
482sub PU_INHIBIT { 0x20000000 }
483sub PU_STOP { 0x40000000 }
484sub PU_NEWMODE { 0x80000000 }
485
486sub PU_RATIO { 0x0000000F }
487
488sub PU_FOOD { 0x00000010 }
489sub PU_DRINK { 0x00000020 }
490sub PU_VALUABLES { 0x00000040 }
491sub PU_BOW { 0x00000080 }
492
493sub PU_ARROW { 0x00000100 }
494sub PU_HELMET { 0x00000200 }
495sub PU_SHIELD { 0x00000400 }
496sub PU_ARMOUR { 0x00000800 }
497
498sub PU_BOOTS { 0x00001000 }
499sub PU_GLOVES { 0x00002000 }
500sub PU_CLOAK { 0x00004000 }
501sub PU_KEY { 0x00008000 }
502
503sub PU_MISSILEWEAPON { 0x00010000 }
504sub PU_ALLWEAPON { 0x00020000 }
505sub PU_MAGICAL { 0x00040000 }
506sub PU_POTION { 0x00080000 }
507
508sub PU_SPELLBOOK { 0x00100000 }
509sub PU_SKILLSCROLL { 0x00200000 }
510sub PU_READABLES { 0x00400000 }
511sub PU_MAGIC_DEVICE { 0x00800000 }
512
513sub PU_NOT_CURSED { 0x01000000 }
514
515sub PU_JEWELS { 0x02000000 }
516
517
3251; 5181;
326 519
327=back 520=back
328 521
329=head1 AUTHOR 522=head1 AUTHOR

Diff Legend

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