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.78 by root, Mon May 29 22:02:06 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")
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})
257 } elsif ($ev->{button} == 1) { 285 } elsif ($ev->{button} == 1) {
258 $::CONN->send ("examine $self->{tag}"); 286 $::CONN->send ("examine $self->{tag}");
259 } elsif ($ev->{button} == 2) { 287 } elsif ($ev->{button} == 2) {
260 $::CONN->send ("apply $self->{tag}"); 288 $::CONN->send ("apply $self->{tag}");
261 } elsif ($ev->{button} == 3) { 289 } elsif ($ev->{button} == 3) {
… …
269 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 297 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
270 ) 298 )
271 : ( 299 : (
272 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 300 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
273 ["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 ]
274 ) 307 )
275 ), 308 ),
276 ); 309 );
277 310
278 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 311 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
… …
283 316
284 my $tooltip_std = "<small>" 317 my $tooltip_std = "<small>"
285 . "Left click - examine item\n" 318 . "Left click - examine item\n"
286 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 319 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
287 . "Middle click - apply\n" 320 . "Middle click - apply\n"
321 . "Shift-Middle click - lock/unlock\n"
288 . "Right click - further options" 322 . "Right click - further options"
289 . "</small>\n"; 323 . "</small>\n";
290 324
291 $self->{face_widget} ||= new CFClient::UI::Face 325 $self->{face_widget} ||= new CFClient::UI::Face
292 can_events => 1, 326 can_events => 1,
… …
331 . ($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. ")
332 . "\n\n$tooltip_std" 366 . "\n\n$tooltip_std"
333 ); 367 );
334} 368}
335 369
336package CFClient::Recorder; 370package CFClient::Binder;
337
338our $RECORD_WINDOW;
339
340my $CMDBOX;
341my $CURRENT_CMDS;
342my $REC_BTN;
343 371
344my @ALLOWED_MODIFIER_KEYS = ( 372my @ALLOWED_MODIFIER_KEYS = (
345 (CFClient::SDLK_LSHIFT) => "LSHIFT", 373 CFClient::SDLK_LSHIFT,
346 (CFClient::SDLK_LCTRL ) => "LCTRL", 374 CFClient::SDLK_LCTRL ,
347 (CFClient::SDLK_LALT ) => "LALT", 375 CFClient::SDLK_LALT ,
348 (CFClient::SDLK_LMETA ) => "LMETA", 376 CFClient::SDLK_LMETA ,
349 377
350 (CFClient::SDLK_RSHIFT) => "RSHIFT", 378 CFClient::SDLK_RSHIFT,
351 (CFClient::SDLK_RCTRL ) => "RCTRL", 379 CFClient::SDLK_RCTRL ,
352 (CFClient::SDLK_RALT ) => "RALT", 380 CFClient::SDLK_RALT ,
353 (CFClient::SDLK_RMETA ) => "RMETA", 381 CFClient::SDLK_RMETA ,
354); 382);
355 383
356my %ALLOWED_MODIFIERS = ( 384my %ALLOWED_MODIFIERS = (
357 (CFClient::KMOD_LSHIFT) => "LSHIFT", 385 CFClient::KMOD_LSHIFT => "LSHIFT",
358 (CFClient::KMOD_LCTRL ) => "LCTRL", 386 CFClient::KMOD_LCTRL => "LCTRL",
359 (CFClient::KMOD_LALT ) => "LALT", 387 CFClient::KMOD_LALT => "LALT",
360 (CFClient::KMOD_LMETA ) => "LMETA", 388 CFClient::KMOD_LMETA => "LMETA",
361 389
362 (CFClient::KMOD_RSHIFT) => "RSHIFT", 390 CFClient::KMOD_RSHIFT => "RSHIFT",
363 (CFClient::KMOD_RCTRL ) => "RCTRL", 391 CFClient::KMOD_RCTRL => "RCTRL",
364 (CFClient::KMOD_RALT ) => "RALT", 392 CFClient::KMOD_RALT => "RALT",
365 (CFClient::KMOD_RMETA ) => "RMETA", 393 CFClient::KMOD_RMETA => "RMETA",
366); 394);
367 395
368my %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/;
369my @DIRECT_BIND_KEYS = ( 397my @DIRECT_BIND_KEYS = (
370 CFClient::SDLK_F1, 398 CFClient::SDLK_F1,
… …
383 CFClient::SDLK_F14, 411 CFClient::SDLK_F14,
384 CFClient::SDLK_F15, 412 CFClient::SDLK_F15,
385); 413);
386 414
387# this binding dialog asks for a key-combo to be pressed 415# this binding dialog asks for a key-combo to be pressed
388# and if successful it binds the modifier+symbol to the 416# and if successful it calls the $cb with $mod and $sym as args.
389# supplied actions in $cmd.
390# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
391sub open_binding_dialog { 417sub open_binding_dialog {
392 my ($cmd) = @_; 418 my ($cb) = @_;
393 419
394 my $w = new CFClient::UI::FancyFrame 420 my $w = new CFClient::UI::FancyFrame
395 title => "Bind Action"; 421 title => "Bind Action",
422 x => "center",
423 y => "center";
396 424
397 $w->add (my $vb = new CFClient::UI::VBox); 425 $w->add (my $vb = new CFClient::UI::VBox);
398 $vb->add (new CFClient::UI::Label 426 $vb->add (new CFClient::UI::Label
399 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."
400 ."You can only bind 0-9 and F1-F15 without modifiers." 428 ."You can only bind 0-9 and F1-F15 without modifiers."
… …
423 return; 451 return;
424 } 452 }
425 453
426 $entry->focus_out; 454 $entry->focus_out;
427 455
428 $::CFG->{bindings}->{$mod}->{$sym} = $cmd; 456 $cb->($mod, $sym);
429 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
430 457
431 $w->destroy 458 $w->destroy
432 }); 459 });
433 460
434 $entry->focus_in; 461 $entry->focus_in;
435 $w->center;
436 $w->show; 462 $w->show;
437} 463}
438 464
439sub keycombo_to_name { 465sub keycombo_to_name {
440 my ($mod, $sym) = @_; 466 my ($mod, $sym) = @_;
441 467
442 my $mods = join '+', 468 my $mods = join '+',
443 map { $ALLOWED_MODIFIERS{$_} } 469 map { $ALLOWED_MODIFIERS{$_} }
444 grep { $_ & $mod } 470 grep { ($_ + 0) & ($mod + 0) }
445 keys %ALLOWED_MODIFIERS; 471 keys %ALLOWED_MODIFIERS;
446 $mods .= "+" if $mods ne ''; 472 $mods .= "+" if $mods ne '';
447 473
448 return $mods . CFClient::SDL_GetKeyName ($sym); 474 return $mods . CFClient::SDL_GetKeyName ($sym);
449} 475}
450 476
451sub clear_command_list { 477package CFClient::Pickup;
452 $CMDBOX->clear () if $CMDBOX; 478# some pickup constants
453} 479sub PU_NOTHING { 0x00000000 }
454 480
455sub set_command_list { 481sub PU_DEBUG { 0x10000000 }
456 my ($list) = @_; 482sub PU_INHIBIT { 0x20000000 }
483sub PU_STOP { 0x40000000 }
484sub PU_NEWMODE { 0x80000000 }
457 485
458 return unless $CMDBOX; 486sub PU_RATIO { 0x0000000F }
459 487
460 $CMDBOX->clear (); 488sub PU_FOOD { 0x00000010 }
461 $CURRENT_CMDS = $list; 489sub PU_DRINK { 0x00000020 }
490sub PU_VALUABLES { 0x00000040 }
491sub PU_BOW { 0x00000080 }
462 492
463 my $idx = 0; 493sub PU_ARROW { 0x00000100 }
494sub PU_HELMET { 0x00000200 }
495sub PU_SHIELD { 0x00000400 }
496sub PU_ARMOUR { 0x00000800 }
464 497
465 for (@$list) { 498sub PU_BOOTS { 0x00001000 }
466 $CMDBOX->add (my $hb = new CFClient::UI::HBox); 499sub PU_GLOVES { 0x00002000 }
500sub PU_CLOAK { 0x00004000 }
501sub PU_KEY { 0x00008000 }
467 502
468 my $i = $idx; 503sub PU_MISSILEWEAPON { 0x00010000 }
469 $hb->add (new CFClient::UI::Button 504sub PU_ALLWEAPON { 0x00020000 }
470 text => "delete", 505sub PU_MAGICAL { 0x00040000 }
471 tooltip => "Deletes the action from the record", 506sub PU_POTION { 0x00080000 }
472 on_activate => sub {
473 $CMDBOX->remove ($hb);
474 $list->[$i] = undef;
475 });
476 507
477 $hb->add (new CFClient::UI::Label text => $_); 508sub PU_SPELLBOOK { 0x00100000 }
509sub PU_SKILLSCROLL { 0x00200000 }
510sub PU_READABLES { 0x00400000 }
511sub PU_MAGIC_DEVICE { 0x00800000 }
478 512
479 $idx++ 513sub PU_NOT_CURSED { 0x01000000 }
480 }
481}
482 514
483# if $show is 1 the recorder will be shown 515sub PU_JEWELS { 0x02000000 }
484sub start {
485 my ($show) = @_;
486 516
487 $RECORD_WINDOW->show if $show;
488
489 $REC_BTN->set_text ("stop recording");
490 $REC_BTN->{recording} = 1;
491 clear_command_list;
492 $::CONN->start_record;
493}
494
495# if $autobind is 1 the recorder will be automatically
496# jump into the binding query and hide the recorder window
497sub stop {
498 my ($autobind) = @_;
499
500 $REC_BTN->set_text ("start recording");
501 $REC_BTN->{recording} = 0;
502
503 my $rec = $::CONN->stop_record;
504 return unless ref $rec eq 'ARRAY';
505 set_command_list ($rec);
506
507 if ($autobind) {
508 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
509 $RECORD_WINDOW->hide;
510 }
511}
512
513sub make_window {
514 $RECORD_WINDOW = new CFClient::UI::FancyFrame
515 req_y => 1,
516 req_x => -1,
517 title => "Action Recorder";
518
519 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
520 $vb->add ($REC_BTN = new CFClient::UI::Button
521 text => "start recording",
522 tooltip => "Start/Stops recording of actions."
523 ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
524 ."All subsequent actions after the recording started will be captured."
525 ."The actions are displayed after the record was stopped."
526 ."To bind the action you have to click on the 'Bind' button",
527 on_activate => sub {
528 my ($btn) = @_;
529
530 unless ($btn->{recording}) {
531 start;
532 } else {
533 stop;
534 }
535 });
536 $vb->add ($CMDBOX = new CFClient::UI::VBox);
537 $vb->add (new CFClient::UI::Button
538 text => "bind",
539 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
540 on_activate => sub {
541 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
542 });
543
544 $RECORD_WINDOW
545}
546 517
5471; 5181;
548 519
549=back 520=back
550 521

Diff Legend

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