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.79 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.86 by elmex, Fri Jun 2 16:27:27 2006 UTC

… …
203 203
204package CFClient::Item; 204package CFClient::Item;
205 205
206use strict; 206use strict;
207use Crossfire::Protocol::Constants; 207use Crossfire::Protocol::Constants;
208
209my $last_enter_count = 1;
208 210
209sub desc_string { 211sub desc_string {
210 my ($self) = @_; 212 my ($self) = @_;
211 213
212 my $desc = 214 my $desc =
… …
238 my $weight = ($self->{nrof} || 1) * $self->{weight}; 240 my $weight = ($self->{nrof} || 1) * $self->{weight};
239 241
240 $weight < 0 ? "?" : $weight * 0.001 242 $weight < 0 ? "?" : $weight * 0.001
241} 243}
242 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
243sub update_widgets { 266sub update_widgets {
244 my ($self) = @_; 267 my ($self) = @_;
245 268
246 my $button_cb = sub { 269 my $button_cb = sub {
247 my (undef, $ev, $x, $y) = @_; 270 my (undef, $ev, $x, $y) = @_;
248 271
272 my $targ = $::CONN->{player}{tag};
273
274 if ($self->{container} == $::CONN->{player}{tag}) {
275 $targ = $::CONN->{open_container};
276 }
277
249 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 278 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
250 my $targ = $::CONN->{player}{tag};
251
252 if ($self->{container} == $::CONN->{player}{tag}) {
253 $targ = $::CONN->{open_container};
254 }
255
256 $::CONN->send ("move $targ $self->{tag} 0") 279 $::CONN->send ("move $targ $self->{tag} 0")
257 if $targ || !($self->{flags} & F_LOCKED); 280 if $targ || !($self->{flags} & F_LOCKED);
281 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
282 $self->{flags} & F_LOCKED
283 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
284 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
258 } elsif ($ev->{button} == 1) { 285 } elsif ($ev->{button} == 1) {
259 $::CONN->send ("examine $self->{tag}"); 286 $::CONN->send ("examine $self->{tag}");
260 } elsif ($ev->{button} == 2) { 287 } elsif ($ev->{button} == 2) {
261 $::CONN->send ("apply $self->{tag}"); 288 $::CONN->send ("apply $self->{tag}");
262 } elsif ($ev->{button} == 3) { 289 } elsif ($ev->{button} == 3) {
… …
270 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 297 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
271 ) 298 )
272 : ( 299 : (
273 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 300 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
274 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], 301 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
302 ["move n",
303 sub {
304 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
305 }
306 ]
275 ) 307 )
276 ), 308 ),
277 ); 309 );
278 310
279 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 311 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
… …
284 316
285 my $tooltip_std = "<small>" 317 my $tooltip_std = "<small>"
286 . "Left click - examine item\n" 318 . "Left click - examine item\n"
287 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 319 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
288 . "Middle click - apply\n" 320 . "Middle click - apply\n"
321 . "Shift-Middle click - lock/unlock\n"
289 . "Right click - further options" 322 . "Right click - further options"
290 . "</small>\n"; 323 . "</small>\n";
291 324
292 $self->{face_widget} ||= new CFClient::UI::Face 325 $self->{face_widget} ||= new CFClient::UI::Face
293 can_events => 1, 326 can_events => 1,
… …
332 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 365 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
333 . "\n\n$tooltip_std" 366 . "\n\n$tooltip_std"
334 ); 367 );
335} 368}
336 369
337package CFClient::Recorder; 370package CFClient::Binder;
338
339our $RECORD_WINDOW;
340
341my $CMDBOX;
342my $CURRENT_CMDS;
343my $REC_BTN;
344 371
345my @ALLOWED_MODIFIER_KEYS = ( 372my @ALLOWED_MODIFIER_KEYS = (
346 (CFClient::SDLK_LSHIFT) => "LSHIFT", 373 CFClient::SDLK_LSHIFT,
347 (CFClient::SDLK_LCTRL ) => "LCTRL", 374 CFClient::SDLK_LCTRL ,
348 (CFClient::SDLK_LALT ) => "LALT", 375 CFClient::SDLK_LALT ,
349 (CFClient::SDLK_LMETA ) => "LMETA", 376 CFClient::SDLK_LMETA ,
350 377
351 (CFClient::SDLK_RSHIFT) => "RSHIFT", 378 CFClient::SDLK_RSHIFT,
352 (CFClient::SDLK_RCTRL ) => "RCTRL", 379 CFClient::SDLK_RCTRL ,
353 (CFClient::SDLK_RALT ) => "RALT", 380 CFClient::SDLK_RALT ,
354 (CFClient::SDLK_RMETA ) => "RMETA", 381 CFClient::SDLK_RMETA ,
355); 382);
356 383
357my %ALLOWED_MODIFIERS = ( 384my %ALLOWED_MODIFIERS = (
358 (CFClient::KMOD_LSHIFT) => "LSHIFT", 385 CFClient::KMOD_LSHIFT => "LSHIFT",
359 (CFClient::KMOD_LCTRL ) => "LCTRL", 386 CFClient::KMOD_LCTRL => "LCTRL",
360 (CFClient::KMOD_LALT ) => "LALT", 387 CFClient::KMOD_LALT => "LALT",
361 (CFClient::KMOD_LMETA ) => "LMETA", 388 CFClient::KMOD_LMETA => "LMETA",
362 389
363 (CFClient::KMOD_RSHIFT) => "RSHIFT", 390 CFClient::KMOD_RSHIFT => "RSHIFT",
364 (CFClient::KMOD_RCTRL ) => "RCTRL", 391 CFClient::KMOD_RCTRL => "RCTRL",
365 (CFClient::KMOD_RALT ) => "RALT", 392 CFClient::KMOD_RALT => "RALT",
366 (CFClient::KMOD_RMETA ) => "RMETA", 393 CFClient::KMOD_RMETA => "RMETA",
367); 394);
368 395
369my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/; 396my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
370my @DIRECT_BIND_KEYS = ( 397my @DIRECT_BIND_KEYS = (
371 CFClient::SDLK_F1, 398 CFClient::SDLK_F1,
… …
384 CFClient::SDLK_F14, 411 CFClient::SDLK_F14,
385 CFClient::SDLK_F15, 412 CFClient::SDLK_F15,
386); 413);
387 414
388# this binding dialog asks for a key-combo to be pressed 415# this binding dialog asks for a key-combo to be pressed
389# and if successful it binds the modifier+symbol to the 416# and if successful it calls the $cb with $mod and $sym as args.
390# supplied actions in $cmd.
391# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
392sub open_binding_dialog { 417sub open_binding_dialog {
393 my ($cmd) = @_; 418 my ($cb) = @_;
394 419
395 my $w = new CFClient::UI::FancyFrame 420 my $w = new CFClient::UI::FancyFrame
396 title => "Bind Action"; 421 title => "Bind Action",
422 x => "center",
423 y => "center";
397 424
398 $w->add (my $vb = new CFClient::UI::VBox); 425 $w->add (my $vb = new CFClient::UI::VBox);
399 $vb->add (new CFClient::UI::Label 426 $vb->add (new CFClient::UI::Label
400 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key." 427 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
401 ."You can only bind 0-9 and F1-F15 without modifiers." 428 ."You can only bind 0-9 and F1-F15 without modifiers."
… …
424 return; 451 return;
425 } 452 }
426 453
427 $entry->focus_out; 454 $entry->focus_out;
428 455
429 $::CFG->{bindings}->{$mod}->{$sym} = $cmd; 456 $cb->($mod, $sym);
430 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
431 457
432 $w->destroy 458 $w->destroy
433 }); 459 });
434 460
435 $entry->focus_in; 461 $entry->focus_in;
436 $w->center;
437 $w->show; 462 $w->show;
438} 463}
439 464
440sub keycombo_to_name { 465sub keycombo_to_name {
441 my ($mod, $sym) = @_; 466 my ($mod, $sym) = @_;
442 467
443 my $mods = join '+', 468 my $mods = join '+',
444 map { $ALLOWED_MODIFIERS{$_} } 469 map { $ALLOWED_MODIFIERS{$_} }
445 grep { $_ & $mod } 470 grep { ($_ + 0) & ($mod + 0) }
446 keys %ALLOWED_MODIFIERS; 471 keys %ALLOWED_MODIFIERS;
447 $mods .= "+" if $mods ne ''; 472 $mods .= "+" if $mods ne '';
448 473
449 return $mods . CFClient::SDL_GetKeyName ($sym); 474 return $mods . CFClient::SDL_GetKeyName ($sym);
450} 475}
451 476
452sub clear_command_list { 477package CFClient::Pickup;
453 $CMDBOX->clear () if $CMDBOX; 478# some pickup constants
454} 479sub PU_NOTHING { 0x00000000 }
455 480
456sub set_command_list { 481sub PU_DEBUG { 0x10000000 }
457 my ($list) = @_; 482sub PU_INHIBIT { 0x20000000 }
483sub PU_STOP { 0x40000000 }
484sub PU_NEWMODE { 0x80000000 }
458 485
459 return unless $CMDBOX; 486sub PU_RATIO { 0x0000000F }
460 487
461 $CMDBOX->clear (); 488sub PU_FOOD { 0x00000010 }
462 $CURRENT_CMDS = $list; 489sub PU_DRINK { 0x00000020 }
490sub PU_VALUABLES { 0x00000040 }
491sub PU_BOW { 0x00000080 }
463 492
464 my $idx = 0; 493sub PU_ARROW { 0x00000100 }
494sub PU_HELMET { 0x00000200 }
495sub PU_SHIELD { 0x00000400 }
496sub PU_ARMOUR { 0x00000800 }
465 497
466 for (@$list) { 498sub PU_BOOTS { 0x00001000 }
467 $CMDBOX->add (my $hb = new CFClient::UI::HBox); 499sub PU_GLOVES { 0x00002000 }
500sub PU_CLOAK { 0x00004000 }
501sub PU_KEY { 0x00008000 }
468 502
469 my $i = $idx; 503sub PU_MISSILEWEAPON { 0x00010000 }
470 $hb->add (new CFClient::UI::Button 504sub PU_ALLWEAPON { 0x00020000 }
471 text => "delete", 505sub PU_MAGICAL { 0x00040000 }
472 tooltip => "Deletes the action from the record", 506sub PU_POTION { 0x00080000 }
473 on_activate => sub {
474 $CMDBOX->remove ($hb);
475 $list->[$i] = undef;
476 });
477 507
478 $hb->add (new CFClient::UI::Label text => $_); 508sub PU_SPELLBOOK { 0x00100000 }
509sub PU_SKILLSCROLL { 0x00200000 }
510sub PU_READABLES { 0x00400000 }
511sub PU_MAGIC_DEVICE { 0x00800000 }
479 512
480 $idx++ 513sub PU_NOT_CURSED { 0x01000000 }
481 }
482}
483 514
484# if $show is 1 the recorder will be shown 515sub PU_JEWELS { 0x02000000 }
485sub start {
486 my ($show) = @_;
487 516
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 517
5481; 5181;
549 519
550=back 520=back
551 521

Diff Legend

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