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.80 by elmex, Tue May 30 08:12:50 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,
… …
332 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 380 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
333 . "\n\n$tooltip_std" 381 . "\n\n$tooltip_std"
334 ); 382 );
335} 383}
336 384
337package CFClient::Recorder; 385package CFClient::Binder;
338
339our $RECORD_WINDOW;
340
341my $CMDBOX;
342my $CURRENT_CMDS;
343my $REC_BTN;
344 386
345my @ALLOWED_MODIFIER_KEYS = ( 387my @ALLOWED_MODIFIER_KEYS = (
346 (CFClient::SDLK_LSHIFT) => "LSHIFT", 388 CFClient::SDLK_LSHIFT,
347 (CFClient::SDLK_LCTRL ) => "LCTRL", 389 CFClient::SDLK_LCTRL ,
348 (CFClient::SDLK_LALT ) => "LALT", 390 CFClient::SDLK_LALT ,
349 (CFClient::SDLK_LMETA ) => "LMETA", 391 CFClient::SDLK_LMETA ,
350 392
351 (CFClient::SDLK_RSHIFT) => "RSHIFT", 393 CFClient::SDLK_RSHIFT,
352 (CFClient::SDLK_RCTRL ) => "RCTRL", 394 CFClient::SDLK_RCTRL ,
353 (CFClient::SDLK_RALT ) => "RALT", 395 CFClient::SDLK_RALT ,
354 (CFClient::SDLK_RMETA ) => "RMETA", 396 CFClient::SDLK_RMETA ,
355); 397);
356 398
357my %ALLOWED_MODIFIERS = ( 399my %ALLOWED_MODIFIERS = (
358 (CFClient::KMOD_LSHIFT) => "LSHIFT", 400 CFClient::KMOD_LSHIFT => "LSHIFT",
359 (CFClient::KMOD_LCTRL ) => "LCTRL", 401 CFClient::KMOD_LCTRL => "LCTRL",
360 (CFClient::KMOD_LALT ) => "LALT", 402 CFClient::KMOD_LALT => "LALT",
361 (CFClient::KMOD_LMETA ) => "LMETA", 403 CFClient::KMOD_LMETA => "LMETA",
362 404
363 (CFClient::KMOD_RSHIFT) => "RSHIFT", 405 CFClient::KMOD_RSHIFT => "RSHIFT",
364 (CFClient::KMOD_RCTRL ) => "RCTRL", 406 CFClient::KMOD_RCTRL => "RCTRL",
365 (CFClient::KMOD_RALT ) => "RALT", 407 CFClient::KMOD_RALT => "RALT",
366 (CFClient::KMOD_RMETA ) => "RMETA", 408 CFClient::KMOD_RMETA => "RMETA",
367); 409);
368 410
369my %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/;
370my @DIRECT_BIND_KEYS = ( 412my @DIRECT_BIND_KEYS = (
371 CFClient::SDLK_F1, 413 CFClient::SDLK_F1,
… …
384 CFClient::SDLK_F14, 426 CFClient::SDLK_F14,
385 CFClient::SDLK_F15, 427 CFClient::SDLK_F15,
386); 428);
387 429
388# this binding dialog asks for a key-combo to be pressed 430# this binding dialog asks for a key-combo to be pressed
389# and if successful it binds the modifier+symbol to the 431# and if successful it calls the $cb with $mod and $sym as args.
390# supplied actions in $cmd.
391# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
392sub open_binding_dialog { 432sub open_binding_dialog {
393 my ($cmd) = @_; 433 my ($cb) = @_;
394 434
395 my $w = new CFClient::UI::FancyFrame 435 my $w = new CFClient::UI::FancyFrame
396 title => "Bind Action", 436 title => "Bind Action",
397 x => "center", 437 x => "center",
398 y => "center"; 438 y => "center";
… …
426 return; 466 return;
427 } 467 }
428 468
429 $entry->focus_out; 469 $entry->focus_out;
430 470
431 $::CFG->{bindings}->{$mod}->{$sym} = $cmd; 471 $cb->($mod, $sym);
432 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
433 472
434 $w->destroy 473 $w->destroy
435 }); 474 });
436 475
437 $entry->focus_in; 476 $entry->focus_in;
… …
441sub keycombo_to_name { 480sub keycombo_to_name {
442 my ($mod, $sym) = @_; 481 my ($mod, $sym) = @_;
443 482
444 my $mods = join '+', 483 my $mods = join '+',
445 map { $ALLOWED_MODIFIERS{$_} } 484 map { $ALLOWED_MODIFIERS{$_} }
446 grep { $_ & $mod } 485 grep { ($_ + 0) & ($mod + 0) }
447 keys %ALLOWED_MODIFIERS; 486 keys %ALLOWED_MODIFIERS;
448 $mods .= "+" if $mods ne ''; 487 $mods .= "+" if $mods ne '';
449 488
450 return $mods . CFClient::SDL_GetKeyName ($sym); 489 return $mods . CFClient::SDL_GetKeyName ($sym);
451} 490}
452 491
453sub clear_command_list { 492package CFClient::Pickup;
454 $CMDBOX->clear () if $CMDBOX; 493# some pickup constants
455} 494sub PU_NOTHING { 0x00000000 }
456 495
457sub set_command_list { 496sub PU_DEBUG { 0x10000000 }
458 my ($list) = @_; 497sub PU_INHIBIT { 0x20000000 }
498sub PU_STOP { 0x40000000 }
499sub PU_NEWMODE { 0x80000000 }
459 500
460 return unless $CMDBOX; 501sub PU_RATIO { 0x0000000F }
461 502
462 $CMDBOX->clear (); 503sub PU_FOOD { 0x00000010 }
463 $CURRENT_CMDS = $list; 504sub PU_DRINK { 0x00000020 }
505sub PU_VALUABLES { 0x00000040 }
506sub PU_BOW { 0x00000080 }
464 507
465 my $idx = 0; 508sub PU_ARROW { 0x00000100 }
509sub PU_HELMET { 0x00000200 }
510sub PU_SHIELD { 0x00000400 }
511sub PU_ARMOUR { 0x00000800 }
466 512
467 for (@$list) { 513sub PU_BOOTS { 0x00001000 }
468 $CMDBOX->add (my $hb = new CFClient::UI::HBox); 514sub PU_GLOVES { 0x00002000 }
515sub PU_CLOAK { 0x00004000 }
516sub PU_KEY { 0x00008000 }
469 517
470 my $i = $idx; 518sub PU_MISSILEWEAPON { 0x00010000 }
471 $hb->add (new CFClient::UI::Button 519sub PU_ALLWEAPON { 0x00020000 }
472 text => "delete", 520sub PU_MAGICAL { 0x00040000 }
473 tooltip => "Deletes the action from the record", 521sub PU_POTION { 0x00080000 }
474 on_activate => sub {
475 $CMDBOX->remove ($hb);
476 $list->[$i] = undef;
477 });
478 522
479 $hb->add (new CFClient::UI::Label text => $_); 523sub PU_SPELLBOOK { 0x00100000 }
524sub PU_SKILLSCROLL { 0x00200000 }
525sub PU_READABLES { 0x00400000 }
526sub PU_MAGIC_DEVICE { 0x00800000 }
480 527
481 $idx++ 528sub PU_NOT_CURSED { 0x01000000 }
482 }
483}
484 529
485# if $show is 1 the recorder will be shown 530sub PU_JEWELS { 0x02000000 }
486sub start {
487 my ($show) = @_;
488 531
489 $RECORD_WINDOW->show if $show;
490
491 $REC_BTN->set_text ("stop recording");
492 $REC_BTN->{recording} = 1;
493 clear_command_list;
494 $::CONN->start_record;
495}
496
497# if $autobind is 1 the recorder will be automatically
498# jump into the binding query and hide the recorder window
499sub stop {
500 my ($autobind) = @_;
501
502 $REC_BTN->set_text ("start recording");
503 $REC_BTN->{recording} = 0;
504
505 my $rec = $::CONN->stop_record;
506 return unless ref $rec eq 'ARRAY';
507 set_command_list ($rec);
508
509 if ($autobind) {
510 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
511 $RECORD_WINDOW->hide;
512 }
513}
514
515sub make_window {
516 $RECORD_WINDOW = new CFClient::UI::FancyFrame
517 req_y => 1,
518 req_x => -1,
519 title => "Action Recorder";
520
521 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
522 $vb->add ($REC_BTN = new CFClient::UI::Button
523 text => "start recording",
524 tooltip => "Start/Stops recording of actions."
525 ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
526 ."All subsequent actions after the recording started will be captured."
527 ."The actions are displayed after the record was stopped."
528 ."To bind the action you have to click on the 'Bind' button",
529 on_activate => sub {
530 my ($btn) = @_;
531
532 unless ($btn->{recording}) {
533 start;
534 } else {
535 stop;
536 }
537 });
538 $vb->add ($CMDBOX = new CFClient::UI::VBox);
539 $vb->add (new CFClient::UI::Button
540 text => "bind",
541 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
542 on_activate => sub {
543 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
544 });
545
546 $RECORD_WINDOW
547}
548 532
5491; 5331;
550 534
551=back 535=back
552 536

Diff Legend

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