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

Diff Legend

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