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.72 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.79 by root, Tue May 30 02:55:45 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
75our $DB_ENV = new BerkeleyDB::Env 84 $DB_ENV = new BerkeleyDB::Env
76 -Home => "$Crossfire::VARDIR/pclient", 85 -Home => "$Crossfire::VARDIR/cfplus",
77 -Cachesize => 1_000_000, 86 -Cachesize => 1_000_000,
78 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 87 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
79# -ErrPrefix => "DATABASE", 88# -ErrPrefix => "DATABASE",
80 -Verbose => 1, 89 -Verbose => 1,
81 -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,
91 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
82 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 92 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
93}
83 94
84sub db_table($) { 95sub db_table($) {
85 my ($table) = @_; 96 my ($table) = @_;
86 97
87 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 98 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
88 99
89 new CFClient::Database 100 new CFClient::Database
90 -Env => $DB_ENV, 101 -Env => $DB_ENV,
91 -Filename => $table, 102 -Filename => $table,
92# -Filename => "database", 103# -Filename => "database",
93# -Subname => $table, 104# -Subname => $table,
94 -Property => DB_CHKSUM, 105 -Property => DB_CHKSUM,
95 -Flags => DB_CREATE | DB_UPGRADE, 106 -Flags => DB_CREATE | DB_UPGRADE,
96 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 107 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
97} 108}
98 109
99sub pod_to_pango($) { 110sub pod_to_pango($) {
100 my ($pom) = @_; 111 my ($pom) = @_;
101 112
… …
240 251
241 if ($self->{container} == $::CONN->{player}{tag}) { 252 if ($self->{container} == $::CONN->{player}{tag}) {
242 $targ = $::CONN->{open_container}; 253 $targ = $::CONN->{open_container};
243 } 254 }
244 255
245 $::CONN->send ("move $targ $self->{tag} 0"); 256 $::CONN->send ("move $targ $self->{tag} 0")
257 if $targ || !($self->{flags} & F_LOCKED);
246 } elsif ($ev->{button} == 1) { 258 } elsif ($ev->{button} == 1) {
247 $::CONN->send ("examine $self->{tag}"); 259 $::CONN->send ("examine $self->{tag}");
248 } elsif ($ev->{button} == 2) { 260 } elsif ($ev->{button} == 2) {
249 $::CONN->send ("apply $self->{tag}"); 261 $::CONN->send ("apply $self->{tag}");
250 } elsif ($ev->{button} == 3) { 262 } elsif ($ev->{button} == 3) {
… …
320 . ($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. ")
321 . "\n\n$tooltip_std" 333 . "\n\n$tooltip_std"
322 ); 334 );
323} 335}
324 336
337package CFClient::Recorder;
338
339our $RECORD_WINDOW;
340
341my $CMDBOX;
342my $CURRENT_CMDS;
343my $REC_BTN;
344
345my @ALLOWED_MODIFIER_KEYS = (
346 (CFClient::SDLK_LSHIFT) => "LSHIFT",
347 (CFClient::SDLK_LCTRL ) => "LCTRL",
348 (CFClient::SDLK_LALT ) => "LALT",
349 (CFClient::SDLK_LMETA ) => "LMETA",
350
351 (CFClient::SDLK_RSHIFT) => "RSHIFT",
352 (CFClient::SDLK_RCTRL ) => "RCTRL",
353 (CFClient::SDLK_RALT ) => "RALT",
354 (CFClient::SDLK_RMETA ) => "RMETA",
355);
356
357my %ALLOWED_MODIFIERS = (
358 (CFClient::KMOD_LSHIFT) => "LSHIFT",
359 (CFClient::KMOD_LCTRL ) => "LCTRL",
360 (CFClient::KMOD_LALT ) => "LALT",
361 (CFClient::KMOD_LMETA ) => "LMETA",
362
363 (CFClient::KMOD_RSHIFT) => "RSHIFT",
364 (CFClient::KMOD_RCTRL ) => "RCTRL",
365 (CFClient::KMOD_RALT ) => "RALT",
366 (CFClient::KMOD_RMETA ) => "RMETA",
367);
368
369my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
370my @DIRECT_BIND_KEYS = (
371 CFClient::SDLK_F1,
372 CFClient::SDLK_F2,
373 CFClient::SDLK_F3,
374 CFClient::SDLK_F4,
375 CFClient::SDLK_F5,
376 CFClient::SDLK_F6,
377 CFClient::SDLK_F7,
378 CFClient::SDLK_F8,
379 CFClient::SDLK_F9,
380 CFClient::SDLK_F10,
381 CFClient::SDLK_F11,
382 CFClient::SDLK_F12,
383 CFClient::SDLK_F13,
384 CFClient::SDLK_F14,
385 CFClient::SDLK_F15,
386);
387
388# this binding dialog asks for a key-combo to be pressed
389# and if successful it binds the modifier+symbol to the
390# supplied actions in $cmd.
391# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
392sub open_binding_dialog {
393 my ($cmd) = @_;
394
395 my $w = new CFClient::UI::FancyFrame
396 title => "Bind Action";
397
398 $w->add (my $vb = new CFClient::UI::VBox);
399 $vb->add (new CFClient::UI::Label
400 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
401 ."You can only bind 0-9 and F1-F15 without modifiers."
402 );
403 $vb->add (my $entry = new CFClient::UI::Entry
404 text => "",
405 on_key_down => sub {
406 my ($entry, $ev) = @_;
407
408 my $mod = $ev->{mod};
409 my $sym = $ev->{sym};
410
411 # XXX: This seems a little bit hackisch to me, but i have to ignore them
412 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
413 return;
414 }
415
416 if ($mod == CFClient::KMOD_NONE
417 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
418 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
419 {
420 $::STATUSBOX->add (
421 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
422 ." directly without modifier! It would damage the completer handling."
423 );
424 return;
425 }
426
427 $entry->focus_out;
428
429 $::CFG->{bindings}->{$mod}->{$sym} = $cmd;
430 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
431
432 $w->destroy
433 });
434
435 $entry->focus_in;
436 $w->center;
437 $w->show;
438}
439
440sub keycombo_to_name {
441 my ($mod, $sym) = @_;
442
443 my $mods = join '+',
444 map { $ALLOWED_MODIFIERS{$_} }
445 grep { $_ & $mod }
446 keys %ALLOWED_MODIFIERS;
447 $mods .= "+" if $mods ne '';
448
449 return $mods . CFClient::SDL_GetKeyName ($sym);
450}
451
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
3251; 5481;
326 549
327=back 550=back
328 551
329=head1 AUTHOR 552=head1 AUTHOR

Diff Legend

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