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.85 by root, Thu Jun 1 05:04:34 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) = @_;
… …
197 203
198package CFClient::Item; 204package CFClient::Item;
199 205
200use strict; 206use strict;
201use Crossfire::Protocol::Constants; 207use Crossfire::Protocol::Constants;
208
209my $last_enter_count = 1;
202 210
203sub desc_string { 211sub desc_string {
204 my ($self) = @_; 212 my ($self) = @_;
205 213
206 my $desc = 214 my $desc =
… …
232 my $weight = ($self->{nrof} || 1) * $self->{weight}; 240 my $weight = ($self->{nrof} || 1) * $self->{weight};
233 241
234 $weight < 0 ? "?" : $weight * 0.001 242 $weight < 0 ? "?" : $weight * 0.001
235} 243}
236 244
245sub do_n_dialog {
246 my ($cb) = @_;
247
248 my $w = new CFClient::UI::FancyFrame;
249 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
250 $vb->add (new CFClient::UI::Label text => "Enter item count:");
251 $vb->add (my $entry = new CFClient::UI::Entry
252 text => $last_enter_count,
253 on_activate => sub {
254 my ($entry) = @_;
255 $last_enter_count = $entry->get_text;
256 $cb->($last_enter_count);
257 $w->hide;
258 $w = undef;
259 }
260 );
261 $entry->focus_in;
262 $w->show;
263
264}
265
237sub update_widgets { 266sub update_widgets {
238 my ($self) = @_; 267 my ($self) = @_;
239 268
240 my $button_cb = sub { 269 my $button_cb = sub {
241 my (undef, $ev, $x, $y) = @_; 270 my (undef, $ev, $x, $y) = @_;
242 271
272 my $targ = $::CONN->{player}{tag};
273
274 if ($self->{container} == $::CONN->{player}{tag}) {
275 $targ = $::CONN->{open_container};
276 }
277
243 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 278 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
244 my $targ = $::CONN->{player}{tag};
245
246 if ($self->{container} == $::CONN->{player}{tag}) {
247 $targ = $::CONN->{open_container};
248 }
249
250 $::CONN->send ("move $targ $self->{tag} 0"); 279 $::CONN->send ("move $targ $self->{tag} 0")
280 if $targ || !($self->{flags} & F_LOCKED);
251 } elsif ($ev->{button} == 1) { 281 } elsif ($ev->{button} == 1) {
252 $::CONN->send ("examine $self->{tag}"); 282 $::CONN->send ("examine $self->{tag}");
253 } elsif ($ev->{button} == 2) { 283 } elsif ($ev->{button} == 2) {
254 $::CONN->send ("apply $self->{tag}"); 284 $::CONN->send ("apply $self->{tag}");
255 } elsif ($ev->{button} == 3) { 285 } elsif ($ev->{button} == 3) {
… …
263 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 293 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
264 ) 294 )
265 : ( 295 : (
266 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 296 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
267 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], 297 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
298 ["move n",
299 sub {
300 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
301 }
302 ]
268 ) 303 )
269 ), 304 ),
270 ); 305 );
271 306
272 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
… …
325 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 360 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
326 . "\n\n$tooltip_std" 361 . "\n\n$tooltip_std"
327 ); 362 );
328} 363}
329 364
330package CFClient::Recorder; 365package CFClient::Binder;
331
332our $RECORD_WINDOW;
333
334my $CMDBOX;
335my $CURRENT_CMDS;
336my $REC_BTN;
337 366
338my @ALLOWED_MODIFIER_KEYS = ( 367my @ALLOWED_MODIFIER_KEYS = (
339 (CFClient::SDLK_LSHIFT) => "LSHIFT", 368 CFClient::SDLK_LSHIFT,
340 (CFClient::SDLK_LCTRL ) => "LCTRL", 369 CFClient::SDLK_LCTRL ,
341 (CFClient::SDLK_LALT ) => "LALT", 370 CFClient::SDLK_LALT ,
342 (CFClient::SDLK_LMETA ) => "LMETA", 371 CFClient::SDLK_LMETA ,
343 372
344 (CFClient::SDLK_RSHIFT) => "RSHIFT", 373 CFClient::SDLK_RSHIFT,
345 (CFClient::SDLK_RCTRL ) => "RCTRL", 374 CFClient::SDLK_RCTRL ,
346 (CFClient::SDLK_RALT ) => "RALT", 375 CFClient::SDLK_RALT ,
347 (CFClient::SDLK_RMETA ) => "RMETA", 376 CFClient::SDLK_RMETA ,
348); 377);
349 378
350my %ALLOWED_MODIFIERS = ( 379my %ALLOWED_MODIFIERS = (
351 (CFClient::KMOD_LSHIFT) => "LSHIFT", 380 CFClient::KMOD_LSHIFT => "LSHIFT",
352 (CFClient::KMOD_LCTRL ) => "LCTRL", 381 CFClient::KMOD_LCTRL => "LCTRL",
353 (CFClient::KMOD_LALT ) => "LALT", 382 CFClient::KMOD_LALT => "LALT",
354 (CFClient::KMOD_LMETA ) => "LMETA", 383 CFClient::KMOD_LMETA => "LMETA",
355 384
356 (CFClient::KMOD_RSHIFT) => "RSHIFT", 385 CFClient::KMOD_RSHIFT => "RSHIFT",
357 (CFClient::KMOD_RCTRL ) => "RCTRL", 386 CFClient::KMOD_RCTRL => "RCTRL",
358 (CFClient::KMOD_RALT ) => "RALT", 387 CFClient::KMOD_RALT => "RALT",
359 (CFClient::KMOD_RMETA ) => "RMETA", 388 CFClient::KMOD_RMETA => "RMETA",
360); 389);
361 390
362my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/; 391my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
363my @DIRECT_BIND_KEYS = ( 392my @DIRECT_BIND_KEYS = (
364 CFClient::SDLK_F1, 393 CFClient::SDLK_F1,
… …
377 CFClient::SDLK_F14, 406 CFClient::SDLK_F14,
378 CFClient::SDLK_F15, 407 CFClient::SDLK_F15,
379); 408);
380 409
381# this binding dialog asks for a key-combo to be pressed 410# this binding dialog asks for a key-combo to be pressed
382# and if successful it binds the modifier+symbol to the 411# 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 { 412sub open_binding_dialog {
386 my ($cmd) = @_; 413 my ($cb) = @_;
387 414
388 my $w = new CFClient::UI::FancyFrame 415 my $w = new CFClient::UI::FancyFrame
389 title => "Bind Action"; 416 title => "Bind Action",
417 x => "center",
418 y => "center";
390 419
391 $w->add (my $vb = new CFClient::UI::VBox); 420 $w->add (my $vb = new CFClient::UI::VBox);
392 $vb->add (new CFClient::UI::Label 421 $vb->add (new CFClient::UI::Label
393 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key." 422 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
394 ."You can only bind 0-9 and F1-F15 without modifiers." 423 ."You can only bind 0-9 and F1-F15 without modifiers."
… …
417 return; 446 return;
418 } 447 }
419 448
420 $entry->focus_out; 449 $entry->focus_out;
421 450
422 $::CFG->{bindings}->{$mod}->{$sym} = $cmd; 451 $cb->($mod, $sym);
423 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
424 452
425 $w->destroy 453 $w->destroy
426 }); 454 });
427 455
428 $entry->focus_in; 456 $entry->focus_in;
429 $w->center;
430 $w->show; 457 $w->show;
431} 458}
432 459
433sub keycombo_to_name { 460sub keycombo_to_name {
434 my ($mod, $sym) = @_; 461 my ($mod, $sym) = @_;
435 462
436 my $mods = join '+', 463 my $mods = join '+',
437 map { $ALLOWED_MODIFIERS{$_} } 464 map { $ALLOWED_MODIFIERS{$_} }
438 grep { $_ & $mod } 465 grep { ($_ + 0) & ($mod + 0) }
439 keys %ALLOWED_MODIFIERS; 466 keys %ALLOWED_MODIFIERS;
440 $mods .= "+" if $mods ne ''; 467 $mods .= "+" if $mods ne '';
441 468
442 return $mods . CFClient::SDL_GetKeyName ($sym); 469 return $mods . CFClient::SDL_GetKeyName ($sym);
443} 470}
444 471
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; 4721;
542 473
543=back 474=back
544 475
545=head1 AUTHOR 476=head1 AUTHOR

Diff Legend

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