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.91 by root, Wed Jun 7 06:28:28 2006 UTC vs.
Revision 1.94 by elmex, Wed Jun 28 09:45:10 2006 UTC

25 25
26use Carp (); 26use Carp ();
27use AnyEvent (); 27use AnyEvent ();
28use BerkeleyDB; 28use BerkeleyDB;
29use Pod::POM (); 29use Pod::POM ();
30use Scalar::Util ();
30use Storable (); # finally 31use Storable (); # finally
31 32
32package CFClient::PodToPango; 33package CFClient::PodToPango;
33 34
34use base Pod::POM::View::Text; 35use base Pod::POM::View::Text;
291 $cb->($last_enter_count); 292 $cb->($last_enter_count);
292 $w->hide; 293 $w->hide;
293 $w = undef; 294 $w = undef;
294 } 295 }
295 ); 296 );
296 $entry->focus_in; 297 $entry->grab_focus;
297 $w->show; 298 $w->show;
298 299
299} 300}
300 301
301sub update_widgets { 302sub update_widgets {
302 my ($self) = @_; 303 my ($self) = @_;
304
305 # necessary to avoid cyclic references
306 Scalar::Util::weaken $self;
303 307
304 my $button_cb = sub { 308 my $button_cb = sub {
305 my (undef, $ev, $x, $y) = @_; 309 my (undef, $ev, $x, $y) = @_;
306 310
307 my $targ = $::CONN->{player}{tag}; 311 my $targ = $::CONN->{player}{tag};
453 my ($cb) = @_; 457 my ($cb) = @_;
454 458
455 my $w = new CFClient::UI::FancyFrame 459 my $w = new CFClient::UI::FancyFrame
456 title => "Bind Action", 460 title => "Bind Action",
457 x => "center", 461 x => "center",
458 y => "center"; 462 y => "center",
463 z => 1000;
459 464
460 $w->add (my $vb = new CFClient::UI::VBox); 465 $w->add (my $vb = new CFClient::UI::VBox);
461 $vb->add (new CFClient::UI::Label 466 $vb->add (new CFClient::UI::Label
462 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key." 467 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
463 ."You can only bind 0-9 and F1-F15 without modifiers." 468 ."You can only bind 0-9 and F1-F15 without modifiers."
484 ." directly without modifier! It would damage the completer handling." 489 ." directly without modifier! It would damage the completer handling."
485 ); 490 );
486 return; 491 return;
487 } 492 }
488 493
489 $entry->focus_out; 494 $entry->grab_focus;
490 495
491 $cb->($mod, $sym); 496 $cb->($mod, $sym);
492 497
493 $w->destroy 498 $w->destroy
494 }); 499 });
495 500
496 $entry->focus_in; 501 $entry->grab_focus;
497 $w->show; 502 $w->show;
498} 503}
499 504
500sub keycombo_to_name { 505sub keycombo_to_name {
501 my ($mod, $sym) = @_; 506 my ($mod, $sym) = @_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines