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.79 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.82 by root, Wed May 31 07:13:50 2006 UTC

… …
78 use strict; 78 use strict;
79 79
80 my $recover = $BerkeleyDB::db_version >= 4.4 80 my $recover = $BerkeleyDB::db_version >= 4.4
81 ? eval "DB_REGISTER | DB_RECOVER" 81 ? eval "DB_REGISTER | DB_RECOVER"
82 : 0; 82 : 0;
83 warn $recover;
83 84
84 $DB_ENV = new BerkeleyDB::Env 85 $DB_ENV = new BerkeleyDB::Env
85 -Home => "$Crossfire::VARDIR/cfplus", 86 -Home => "$Crossfire::VARDIR/cfplus",
86 -Cachesize => 1_000_000, 87 -Cachesize => 1_000_000,
87 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", 88 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
… …
332 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 333 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
333 . "\n\n$tooltip_std" 334 . "\n\n$tooltip_std"
334 ); 335 );
335} 336}
336 337
337package CFClient::Recorder; 338package CFClient::Binder;
338
339our $RECORD_WINDOW;
340
341my $CMDBOX;
342my $CURRENT_CMDS;
343my $REC_BTN;
344 339
345my @ALLOWED_MODIFIER_KEYS = ( 340my @ALLOWED_MODIFIER_KEYS = (
346 (CFClient::SDLK_LSHIFT) => "LSHIFT", 341 (CFClient::SDLK_LSHIFT),
347 (CFClient::SDLK_LCTRL ) => "LCTRL", 342 (CFClient::SDLK_LCTRL ),
348 (CFClient::SDLK_LALT ) => "LALT", 343 (CFClient::SDLK_LALT ),
349 (CFClient::SDLK_LMETA ) => "LMETA", 344 (CFClient::SDLK_LMETA ),
350 345
351 (CFClient::SDLK_RSHIFT) => "RSHIFT", 346 (CFClient::SDLK_RSHIFT),
352 (CFClient::SDLK_RCTRL ) => "RCTRL", 347 (CFClient::SDLK_RCTRL ),
353 (CFClient::SDLK_RALT ) => "RALT", 348 (CFClient::SDLK_RALT ),
354 (CFClient::SDLK_RMETA ) => "RMETA", 349 (CFClient::SDLK_RMETA ),
355); 350);
356 351
357my %ALLOWED_MODIFIERS = ( 352my %ALLOWED_MODIFIERS = (
358 (CFClient::KMOD_LSHIFT) => "LSHIFT", 353 (CFClient::KMOD_LSHIFT) => "LSHIFT",
359 (CFClient::KMOD_LCTRL ) => "LCTRL", 354 (CFClient::KMOD_LCTRL ) => "LCTRL",
… …
384 CFClient::SDLK_F14, 379 CFClient::SDLK_F14,
385 CFClient::SDLK_F15, 380 CFClient::SDLK_F15,
386); 381);
387 382
388# this binding dialog asks for a key-combo to be pressed 383# this binding dialog asks for a key-combo to be pressed
389# and if successful it binds the modifier+symbol to the 384# 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 { 385sub open_binding_dialog {
393 my ($cmd) = @_; 386 my ($cb) = @_;
394 387
395 my $w = new CFClient::UI::FancyFrame 388 my $w = new CFClient::UI::FancyFrame
396 title => "Bind Action"; 389 title => "Bind Action",
390 x => "center",
391 y => "center";
397 392
398 $w->add (my $vb = new CFClient::UI::VBox); 393 $w->add (my $vb = new CFClient::UI::VBox);
399 $vb->add (new CFClient::UI::Label 394 $vb->add (new CFClient::UI::Label
400 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key." 395 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
401 ."You can only bind 0-9 and F1-F15 without modifiers." 396 ."You can only bind 0-9 and F1-F15 without modifiers."
… …
424 return; 419 return;
425 } 420 }
426 421
427 $entry->focus_out; 422 $entry->focus_out;
428 423
429 $::CFG->{bindings}->{$mod}->{$sym} = $cmd; 424 $cb->($mod, $sym);
430 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
431 425
432 $w->destroy 426 $w->destroy
433 }); 427 });
434 428
435 $entry->focus_in; 429 $entry->focus_in;
436 $w->center;
437 $w->show; 430 $w->show;
438} 431}
439 432
440sub keycombo_to_name { 433sub keycombo_to_name {
441 my ($mod, $sym) = @_; 434 my ($mod, $sym) = @_;
442 435
443 my $mods = join '+', 436 my $mods = join '+',
444 map { $ALLOWED_MODIFIERS{$_} } 437 map { $ALLOWED_MODIFIERS{$_} }
445 grep { $_ & $mod } 438 grep { ($_ + 0) & ($mod + 0) }
446 keys %ALLOWED_MODIFIERS; 439 keys %ALLOWED_MODIFIERS;
447 $mods .= "+" if $mods ne ''; 440 $mods .= "+" if $mods ne '';
448 441
449 return $mods . CFClient::SDL_GetKeyName ($sym); 442 return $mods . CFClient::SDL_GetKeyName ($sym);
450} 443}
451 444
452sub clear_command_list {
453 $CMDBOX->clear () if $CMDBOX;
454}
455
456sub set_command_list {
457 my ($list) = @_;
458
459 return unless $CMDBOX;
460
461 $CMDBOX->clear ();
462 $CURRENT_CMDS = $list;
463
464 my $idx = 0;
465
466 for (@$list) {
467 $CMDBOX->add (my $hb = new CFClient::UI::HBox);
468
469 my $i = $idx;
470 $hb->add (new CFClient::UI::Button
471 text => "delete",
472 tooltip => "Deletes the action from the record",
473 on_activate => sub {
474 $CMDBOX->remove ($hb);
475 $list->[$i] = undef;
476 });
477
478 $hb->add (new CFClient::UI::Label text => $_);
479
480 $idx++
481 }
482}
483
484# if $show is 1 the recorder will be shown
485sub start {
486 my ($show) = @_;
487
488 $RECORD_WINDOW->show if $show;
489
490 $REC_BTN->set_text ("stop recording");
491 $REC_BTN->{recording} = 1;
492 clear_command_list;
493 $::CONN->start_record;
494}
495
496# if $autobind is 1 the recorder will be automatically
497# jump into the binding query and hide the recorder window
498sub stop {
499 my ($autobind) = @_;
500
501 $REC_BTN->set_text ("start recording");
502 $REC_BTN->{recording} = 0;
503
504 my $rec = $::CONN->stop_record;
505 return unless ref $rec eq 'ARRAY';
506 set_command_list ($rec);
507
508 if ($autobind) {
509 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
510 $RECORD_WINDOW->hide;
511 }
512}
513
514sub make_window {
515 $RECORD_WINDOW = new CFClient::UI::FancyFrame
516 req_y => 1,
517 req_x => -1,
518 title => "Action Recorder";
519
520 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
521 $vb->add ($REC_BTN = new CFClient::UI::Button
522 text => "start recording",
523 tooltip => "Start/Stops recording of actions."
524 ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
525 ."All subsequent actions after the recording started will be captured."
526 ."The actions are displayed after the record was stopped."
527 ."To bind the action you have to click on the 'Bind' button",
528 on_activate => sub {
529 my ($btn) = @_;
530
531 unless ($btn->{recording}) {
532 start;
533 } else {
534 stop;
535 }
536 });
537 $vb->add ($CMDBOX = new CFClient::UI::VBox);
538 $vb->add (new CFClient::UI::Button
539 text => "bind",
540 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
541 on_activate => sub {
542 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
543 });
544
545 $RECORD_WINDOW
546}
547
5481; 4451;
549 446
550=back 447=back
551 448
552=head1 AUTHOR 449=head1 AUTHOR

Diff Legend

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