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.81 by elmex, Tue May 30 14:35:08 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
78 our $DB_ENV = new BerkeleyDB::Env 84 $DB_ENV = new BerkeleyDB::Env
79 -Home => "$Crossfire::VARDIR/cfplus", 85 -Home => "$Crossfire::VARDIR/cfplus",
80 -Cachesize => 1_000_000, 86 -Cachesize => 1_000_000,
81 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", 87 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
82# -ErrPrefix => "DATABASE", 88# -ErrPrefix => "DATABASE",
83 -Verbose => 1, 89 -Verbose => 1,
84 -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,
85 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE | DB_TXN_WRITE_NOSYNC, 91 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
86 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; 92 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
87} 93}
88 94
89sub db_table($) { 95sub db_table($) {
90 my ($table) = @_; 96 my ($table) = @_;
… …
245 251
246 if ($self->{container} == $::CONN->{player}{tag}) { 252 if ($self->{container} == $::CONN->{player}{tag}) {
247 $targ = $::CONN->{open_container}; 253 $targ = $::CONN->{open_container};
248 } 254 }
249 255
250 $::CONN->send ("move $targ $self->{tag} 0"); 256 $::CONN->send ("move $targ $self->{tag} 0")
257 if $targ || !($self->{flags} & F_LOCKED);
251 } elsif ($ev->{button} == 1) { 258 } elsif ($ev->{button} == 1) {
252 $::CONN->send ("examine $self->{tag}"); 259 $::CONN->send ("examine $self->{tag}");
253 } elsif ($ev->{button} == 2) { 260 } elsif ($ev->{button} == 2) {
254 $::CONN->send ("apply $self->{tag}"); 261 $::CONN->send ("apply $self->{tag}");
255 } elsif ($ev->{button} == 3) { 262 } elsif ($ev->{button} == 3) {
… …
325 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 332 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
326 . "\n\n$tooltip_std" 333 . "\n\n$tooltip_std"
327 ); 334 );
328} 335}
329 336
330package CFClient::Recorder; 337package CFClient::Binder;
331
332our $RECORD_WINDOW;
333
334my $CMDBOX;
335my $CURRENT_CMDS;
336my $REC_BTN;
337 338
338my @ALLOWED_MODIFIER_KEYS = ( 339my @ALLOWED_MODIFIER_KEYS = (
339 (CFClient::SDLK_LSHIFT) => "LSHIFT", 340 (CFClient::SDLK_LSHIFT),
340 (CFClient::SDLK_LCTRL ) => "LCTRL", 341 (CFClient::SDLK_LCTRL ),
341 (CFClient::SDLK_LALT ) => "LALT", 342 (CFClient::SDLK_LALT ),
342 (CFClient::SDLK_LMETA ) => "LMETA", 343 (CFClient::SDLK_LMETA ),
343 344
344 (CFClient::SDLK_RSHIFT) => "RSHIFT", 345 (CFClient::SDLK_RSHIFT),
345 (CFClient::SDLK_RCTRL ) => "RCTRL", 346 (CFClient::SDLK_RCTRL ),
346 (CFClient::SDLK_RALT ) => "RALT", 347 (CFClient::SDLK_RALT ),
347 (CFClient::SDLK_RMETA ) => "RMETA", 348 (CFClient::SDLK_RMETA ),
348); 349);
349 350
350my %ALLOWED_MODIFIERS = ( 351my %ALLOWED_MODIFIERS = (
351 (CFClient::KMOD_LSHIFT) => "LSHIFT", 352 (CFClient::KMOD_LSHIFT) => "LSHIFT",
352 (CFClient::KMOD_LCTRL ) => "LCTRL", 353 (CFClient::KMOD_LCTRL ) => "LCTRL",
… …
377 CFClient::SDLK_F14, 378 CFClient::SDLK_F14,
378 CFClient::SDLK_F15, 379 CFClient::SDLK_F15,
379); 380);
380 381
381# this binding dialog asks for a key-combo to be pressed 382# this binding dialog asks for a key-combo to be pressed
382# and if successful it binds the modifier+symbol to the 383# 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 { 384sub open_binding_dialog {
386 my ($cmd) = @_; 385 my ($cb) = @_;
387 386
388 my $w = new CFClient::UI::FancyFrame 387 my $w = new CFClient::UI::FancyFrame
389 title => "Bind Action"; 388 title => "Bind Action",
389 x => "center",
390 y => "center";
390 391
391 $w->add (my $vb = new CFClient::UI::VBox); 392 $w->add (my $vb = new CFClient::UI::VBox);
392 $vb->add (new CFClient::UI::Label 393 $vb->add (new CFClient::UI::Label
393 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key." 394 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
394 ."You can only bind 0-9 and F1-F15 without modifiers." 395 ."You can only bind 0-9 and F1-F15 without modifiers."
… …
417 return; 418 return;
418 } 419 }
419 420
420 $entry->focus_out; 421 $entry->focus_out;
421 422
422 $::CFG->{bindings}->{$mod}->{$sym} = $cmd; 423 $cb->($mod, $sym);
423 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
424 424
425 $w->destroy 425 $w->destroy
426 }); 426 });
427 427
428 $entry->focus_in; 428 $entry->focus_in;
429 $w->center;
430 $w->show; 429 $w->show;
431} 430}
432 431
433sub keycombo_to_name { 432sub keycombo_to_name {
434 my ($mod, $sym) = @_; 433 my ($mod, $sym) = @_;
435 434
436 my $mods = join '+', 435 my $mods = join '+',
437 map { $ALLOWED_MODIFIERS{$_} } 436 map { $ALLOWED_MODIFIERS{$_} }
438 grep { $_ & $mod } 437 grep { ($_ + 0) & ($mod + 0) }
439 keys %ALLOWED_MODIFIERS; 438 keys %ALLOWED_MODIFIERS;
440 $mods .= "+" if $mods ne ''; 439 $mods .= "+" if $mods ne '';
441 440
442 return $mods . CFClient::SDL_GetKeyName ($sym); 441 return $mods . CFClient::SDL_GetKeyName ($sym);
443} 442}
444 443
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; 4441;
542 445
543=back 446=back
544 447
545=head1 AUTHOR 448=head1 AUTHOR

Diff Legend

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