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.76 by root, Mon May 29 21:20:15 2006 UTC vs.
Revision 1.82 by root, Wed May 31 07:13:50 2006 UTC

… …
70 close CFG; 70 close CFG;
71} 71}
72 72
73mkdir "$Crossfire::VARDIR/cfplus", 0777; 73mkdir "$Crossfire::VARDIR/cfplus", 0777;
74 74
75our $DB_ENV;
76
75{ 77{
76 use strict; 78 use strict;
77 79
80 my $recover = $BerkeleyDB::db_version >= 4.4
81 ? eval "DB_REGISTER | DB_RECOVER"
82 : 0;
83 warn $recover;
84
78 our $DB_ENV = new BerkeleyDB::Env 85 $DB_ENV = new BerkeleyDB::Env
79 -Home => "$Crossfire::VARDIR/cfplus", 86 -Home => "$Crossfire::VARDIR/cfplus",
80 -Cachesize => 1_000_000, 87 -Cachesize => 1_000_000,
81 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", 88 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
82# -ErrPrefix => "DATABASE", 89# -ErrPrefix => "DATABASE",
83 -Verbose => 1, 90 -Verbose => 1,
84 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 91 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
85 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE | DB_TXN_WRITE_NOSYNC, 92 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
86 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; 93 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
87} 94}
88 95
89sub db_table($) { 96sub db_table($) {
90 my ($table) = @_; 97 my ($table) = @_;
… …
245 252
246 if ($self->{container} == $::CONN->{player}{tag}) { 253 if ($self->{container} == $::CONN->{player}{tag}) {
247 $targ = $::CONN->{open_container}; 254 $targ = $::CONN->{open_container};
248 } 255 }
249 256
250 $::CONN->send ("move $targ $self->{tag} 0"); 257 $::CONN->send ("move $targ $self->{tag} 0")
258 if $targ || !($self->{flags} & F_LOCKED);
251 } elsif ($ev->{button} == 1) { 259 } elsif ($ev->{button} == 1) {
252 $::CONN->send ("examine $self->{tag}"); 260 $::CONN->send ("examine $self->{tag}");
253 } elsif ($ev->{button} == 2) { 261 } elsif ($ev->{button} == 2) {
254 $::CONN->send ("apply $self->{tag}"); 262 $::CONN->send ("apply $self->{tag}");
255 } elsif ($ev->{button} == 3) { 263 } elsif ($ev->{button} == 3) {
… …
325 . ($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. ")
326 . "\n\n$tooltip_std" 334 . "\n\n$tooltip_std"
327 ); 335 );
328} 336}
329 337
330package CFClient::Recorder; 338package CFClient::Binder;
331
332our $RECORD_WINDOW;
333
334my $CMDBOX;
335my $CURRENT_CMDS;
336my $REC_BTN;
337 339
338my @ALLOWED_MODIFIER_KEYS = ( 340my @ALLOWED_MODIFIER_KEYS = (
339 (CFClient::SDLK_LSHIFT) => "LSHIFT", 341 (CFClient::SDLK_LSHIFT),
340 (CFClient::SDLK_LCTRL ) => "LCTRL", 342 (CFClient::SDLK_LCTRL ),
341 (CFClient::SDLK_LALT ) => "LALT", 343 (CFClient::SDLK_LALT ),
342 (CFClient::SDLK_LMETA ) => "LMETA", 344 (CFClient::SDLK_LMETA ),
343 345
344 (CFClient::SDLK_RSHIFT) => "RSHIFT", 346 (CFClient::SDLK_RSHIFT),
345 (CFClient::SDLK_RCTRL ) => "RCTRL", 347 (CFClient::SDLK_RCTRL ),
346 (CFClient::SDLK_RALT ) => "RALT", 348 (CFClient::SDLK_RALT ),
347 (CFClient::SDLK_RMETA ) => "RMETA", 349 (CFClient::SDLK_RMETA ),
348); 350);
349 351
350my %ALLOWED_MODIFIERS = ( 352my %ALLOWED_MODIFIERS = (
351 (CFClient::KMOD_LSHIFT) => "LSHIFT", 353 (CFClient::KMOD_LSHIFT) => "LSHIFT",
352 (CFClient::KMOD_LCTRL ) => "LCTRL", 354 (CFClient::KMOD_LCTRL ) => "LCTRL",
… …
377 CFClient::SDLK_F14, 379 CFClient::SDLK_F14,
378 CFClient::SDLK_F15, 380 CFClient::SDLK_F15,
379); 381);
380 382
381# this binding dialog asks for a key-combo to be pressed 383# this binding dialog asks for a key-combo to be pressed
382# and if successful it binds the modifier+symbol to the 384# and if successful it calls the $cb with $mod and $sym as args.
383# supplied actions in $cmd.
384# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
385sub open_binding_dialog { 385sub open_binding_dialog {
386 my ($cmd) = @_; 386 my ($cb) = @_;
387 387
388 my $w = new CFClient::UI::FancyFrame 388 my $w = new CFClient::UI::FancyFrame
389 title => "Bind Action"; 389 title => "Bind Action",
390 x => "center",
391 y => "center";
390 392
391 $w->add (my $vb = new CFClient::UI::VBox); 393 $w->add (my $vb = new CFClient::UI::VBox);
392 $vb->add (new CFClient::UI::Label 394 $vb->add (new CFClient::UI::Label
393 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."
394 ."You can only bind 0-9 and F1-F15 without modifiers." 396 ."You can only bind 0-9 and F1-F15 without modifiers."
… …
417 return; 419 return;
418 } 420 }
419 421
420 $entry->focus_out; 422 $entry->focus_out;
421 423
422 $::CFG->{bindings}->{$mod}->{$sym} = $cmd; 424 $cb->($mod, $sym);
423 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
424 425
425 $w->destroy 426 $w->destroy
426 }); 427 });
427 428
428 $entry->focus_in; 429 $entry->focus_in;
429 $w->center;
430 $w->show; 430 $w->show;
431} 431}
432 432
433sub keycombo_to_name { 433sub keycombo_to_name {
434 my ($mod, $sym) = @_; 434 my ($mod, $sym) = @_;
435 435
436 my $mods = join '+', 436 my $mods = join '+',
437 map { $ALLOWED_MODIFIERS{$_} } 437 map { $ALLOWED_MODIFIERS{$_} }
438 grep { $_ & $mod } 438 grep { ($_ + 0) & ($mod + 0) }
439 keys %ALLOWED_MODIFIERS; 439 keys %ALLOWED_MODIFIERS;
440 $mods .= "+" if $mods ne ''; 440 $mods .= "+" if $mods ne '';
441 441
442 return $mods . CFClient::SDL_GetKeyName ($sym); 442 return $mods . CFClient::SDL_GetKeyName ($sym);
443} 443}
444 444
445sub clear_command_list {
446 $CMDBOX->clear () if $CMDBOX;
447}
448
449sub set_command_list {
450 my ($list) = @_;
451
452 return unless $CMDBOX;
453
454 $CMDBOX->clear ();
455 $CURRENT_CMDS = $list;
456
457 my $idx = 0;
458
459 for (@$list) {
460 $CMDBOX->add (my $hb = new CFClient::UI::HBox);
461
462 my $i = $idx;
463 $hb->add (new CFClient::UI::Button
464 text => "delete",
465 tooltip => "Deletes the action from the record",
466 on_activate => sub {
467 $CMDBOX->remove ($hb);
468 $list->[$i] = undef;
469 });
470
471 $hb->add (new CFClient::UI::Label text => $_);
472
473 $idx++
474 }
475}
476
477# if $show is 1 the recorder will be shown
478sub start {
479 my ($show) = @_;
480
481 $RECORD_WINDOW->show if $show;
482
483 $REC_BTN->set_text ("stop recording");
484 $REC_BTN->{recording} = 1;
485 clear_command_list;
486 $::CONN->start_record;
487}
488
489# if $autobind is 1 the recorder will be automatically
490# jump into the binding query and hide the recorder window
491sub stop {
492 my ($autobind) = @_;
493
494 $REC_BTN->set_text ("start recording");
495 $REC_BTN->{recording} = 0;
496
497 my $rec = $::CONN->stop_record;
498 return unless ref $rec eq 'ARRAY';
499 set_command_list ($rec);
500
501 if ($autobind) {
502 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
503 $RECORD_WINDOW->hide;
504 }
505}
506
507sub make_window {
508 $RECORD_WINDOW = new CFClient::UI::FancyFrame
509 req_y => 1,
510 req_x => -1,
511 title => "Action Recorder";
512
513 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
514 $vb->add ($REC_BTN = new CFClient::UI::Button
515 text => "start recording",
516 tooltip => "Start/Stops recording of actions."
517 ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
518 ."All subsequent actions after the recording started will be captured."
519 ."The actions are displayed after the record was stopped."
520 ."To bind the action you have to click on the 'Bind' button",
521 on_activate => sub {
522 my ($btn) = @_;
523
524 unless ($btn->{recording}) {
525 start;
526 } else {
527 stop;
528 }
529 });
530 $vb->add ($CMDBOX = new CFClient::UI::VBox);
531 $vb->add (new CFClient::UI::Button
532 text => "bind",
533 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
534 on_activate => sub {
535 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
536 });
537
538 $RECORD_WINDOW
539}
540
5411; 4451;
542 446
543=back 447=back
544 448
545=head1 AUTHOR 449=head1 AUTHOR

Diff Legend

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