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.74 by elmex, Mon May 29 19:49:33 2006 UTC vs.
Revision 1.82 by root, Wed May 31 07:13:50 2006 UTC

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

Diff Legend

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