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.95 by root, Sun Jul 2 13:57:57 2006 UTC vs.
Revision 1.100 by root, Sun Jul 16 20:04:07 2006 UTC

… …
234 [ 234 [
235 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], 235 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
236 split /\n/, $pom->present ("CFClient::PodToPango") 236 split /\n/, $pom->present ("CFClient::PodToPango")
237 ] 237 ]
238} 238}
239
240package CFClient::Layout;
241
242$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
243 reset_glyph_cache;
244};
239 245
240package CFClient::Item; 246package CFClient::Item;
241 247
242use strict; 248use strict;
243use Crossfire::Protocol::Constants; 249use Crossfire::Protocol::Constants;
… …
279} 285}
280 286
281sub do_n_dialog { 287sub do_n_dialog {
282 my ($cb) = @_; 288 my ($cb) = @_;
283 289
284 my $w = new CFClient::UI::FancyFrame; 290 my $w = new CFClient::UI::FancyFrame
291 on_delete => sub { $_[0]->destroy; 1 },
292 has_close_button => 1,
293 ;
294
285 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); 295 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
286 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 296 $vb->add (new CFClient::UI::Label text => "Enter item count:");
287 $vb->add (my $entry = new CFClient::UI::Entry 297 $vb->add (my $entry = new CFClient::UI::Entry
288 text => $last_enter_count, 298 text => $last_enter_count,
289 on_activate => sub { 299 on_activate => sub {
290 my ($entry) = @_; 300 my ($entry) = @_;
291 $last_enter_count = $entry->get_text; 301 $last_enter_count = $entry->get_text;
292 $cb->($last_enter_count); 302 $cb->($last_enter_count);
293 $w->hide; 303 $w->hide;
294 $w = undef; 304 $w->destroy;
305
306 0
295 } 307 },
308 on_escape => sub { $w->destroy; 1 },
296 ); 309 );
297 $entry->grab_focus; 310 $entry->grab_focus;
298 $w->show; 311 $w->show;
299
300} 312}
301 313
302sub update_widgets { 314sub update_widgets {
303 my ($self) = @_; 315 my ($self) = @_;
304 316
… …
327 $::CONN->send ("apply $self->{tag}"); 339 $::CONN->send ("apply $self->{tag}");
328 } elsif ($ev->{button} == 3) { 340 } elsif ($ev->{button} == 3) {
329 my @menu_items = ( 341 my @menu_items = (
330 ["examine", sub { $::CONN->send ("examine $self->{tag}") }], 342 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
331 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 343 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
344 ["ignite/thaw", # first try of an easier use of flint&steel
345 sub {
346 $::CONN->send ("mark ". pack "N", $self->{tag});
347 $::CONN->send ("command apply flint and steel");
348 }
349 ],
332 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 350 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
333 ( 351 (
334 $self->{flags} & F_LOCKED 352 $self->{flags} & F_LOCKED
335 ? ( 353 ? (
336 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 354 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
… …
404 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 422 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
405 . "\n\n$tooltip_std" 423 . "\n\n$tooltip_std"
406 ); 424 );
407} 425}
408 426
409package CFClient::Binder;
410
411my @ALLOWED_MODIFIER_KEYS = (
412 CFClient::SDLK_LSHIFT,
413 CFClient::SDLK_LCTRL ,
414 CFClient::SDLK_LALT ,
415 CFClient::SDLK_LMETA ,
416
417 CFClient::SDLK_RSHIFT,
418 CFClient::SDLK_RCTRL ,
419 CFClient::SDLK_RALT ,
420 CFClient::SDLK_RMETA ,
421);
422
423my %ALLOWED_MODIFIERS = (
424 CFClient::KMOD_LSHIFT => "LSHIFT",
425 CFClient::KMOD_LCTRL => "LCTRL",
426 CFClient::KMOD_LALT => "LALT",
427 CFClient::KMOD_LMETA => "LMETA",
428
429 CFClient::KMOD_RSHIFT => "RSHIFT",
430 CFClient::KMOD_RCTRL => "RCTRL",
431 CFClient::KMOD_RALT => "RALT",
432 CFClient::KMOD_RMETA => "RMETA",
433);
434
435my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
436my @DIRECT_BIND_KEYS = (
437 CFClient::SDLK_F1,
438 CFClient::SDLK_F2,
439 CFClient::SDLK_F3,
440 CFClient::SDLK_F4,
441 CFClient::SDLK_F5,
442 CFClient::SDLK_F6,
443 CFClient::SDLK_F7,
444 CFClient::SDLK_F8,
445 CFClient::SDLK_F9,
446 CFClient::SDLK_F10,
447 CFClient::SDLK_F11,
448 CFClient::SDLK_F12,
449 CFClient::SDLK_F13,
450 CFClient::SDLK_F14,
451 CFClient::SDLK_F15,
452);
453
454# this binding dialog asks for a key-combo to be pressed
455# and if successful it calls the $cb with $mod and $sym as args.
456sub open_binding_dialog {
457 my ($cb) = @_;
458
459 my $w = new CFClient::UI::FancyFrame
460 title => "Bind Action",
461 x => "center",
462 y => "center",
463 z => 1000,
464 has_close_button => 1;
465
466 $w->add (my $vb = new CFClient::UI::VBox);
467 $vb->add (new CFClient::UI::Label
468 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
469 . "You can only bind 0-9 and F1-F15 without modifiers."
470 );
471 $vb->add (my $entry = new CFClient::UI::Entry
472 text => "",
473 on_key_down => sub {
474 my ($entry, $ev) = @_;
475
476 my $mod = $ev->{mod};
477 my $sym = $ev->{sym};
478
479 # XXX: This seems a little bit hackisch to me, but i have to ignore them
480 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
481 return;
482 }
483
484 if ($mod == CFClient::KMOD_NONE
485 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
486 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
487 {
488 $::STATUSBOX->add (
489 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
490 ." directly without modifier! It would damage the completer handling."
491 );
492 return;
493 }
494
495 $entry->grab_focus;
496
497 $cb->($mod, $sym);
498
499 $w->destroy
500 });
501
502 $entry->grab_focus;
503 $w->show;
504}
505
506sub keycombo_to_name {
507 my ($mod, $sym) = @_;
508
509 my $mods = join '+',
510 map { $ALLOWED_MODIFIERS{$_} }
511 grep { ($_ + 0) & ($mod + 0) }
512 keys %ALLOWED_MODIFIERS;
513 $mods .= "+" if $mods ne '';
514
515 return $mods . CFClient::SDL_GetKeyName ($sym);
516}
517
5181; 4271;
519 428
520=back 429=back
521 430
522=head1 AUTHOR 431=head1 AUTHOR

Diff Legend

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