ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.5 by elmex, Sat May 27 10:32:35 2006 UTC vs.
Revision 1.7 by root, Sat May 27 20:46:54 2006 UTC

25 25
26 my $cmd = $1; 26 my $cmd = $1;
27 my @args = split /\|/, $2; 27 my @args = split /\|/, $2;
28 @args = (".*") unless @args; 28 @args = (".*") unless @args;
29 29
30 $_ = $_ eq ".*" ? "" : " $_"
31 for @args;
32
30 my $text = CFClient::pod_to_pango $head2->content; 33 my $text = CFClient::pod_to_pango $head2->content;
31 34
32 for my $arg (@args) {
33 $arg = $arg eq ".*" ? "" : " $arg";
34
35 $self->{map_widget}->add_command ("$cmd$arg", $text); 35 $self->{map_widget}->add_command ("$cmd$_", $text)
36 } 36 for sort { (length $a) <=> (length $b) }
37 @args;
37 } 38 }
38 39
39 $self->{noface} = new_from_file CFClient::Texture 40 $self->{noface} = new_from_file CFClient::Texture
40 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 41 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
41 42
335 336
336 if ($flags & CS_QUERY_YESNO) { 337 if ($flags & CS_QUERY_YESNO) {
337 $vbox->add (my $hbox = new CFClient::UI::HBox); 338 $vbox->add (my $hbox = new CFClient::UI::HBox);
338 $hbox->add (new CFClient::UI::Button 339 $hbox->add (new CFClient::UI::Button
339 text => "No", 340 text => "No",
340 connect_activate => sub { 341 on_activate => sub {
341 $self->send ("reply n"); 342 $self->send ("reply n");
342 $dialog->destroy; 343 $dialog->destroy;
343 $self->{map_widget}->focus_in; 344 $self->{map_widget}->focus_in;
344 } 345 }
345 ); 346 );
346 $hbox->add (new CFClient::UI::Button 347 $hbox->add (new CFClient::UI::Button
347 text => "Yes", 348 text => "Yes",
348 connect_activate => sub { 349 on_activate => sub {
349 $self->send ("reply y"); 350 $self->send ("reply y");
350 $dialog->destroy; 351 $dialog->destroy;
351 }, 352 },
352 ); 353 );
353 354
354 $dialog->focus_in; 355 $dialog->focus_in;
355 356
356 } elsif ($flags & CS_QUERY_SINGLECHAR) { 357 } elsif ($flags & CS_QUERY_SINGLECHAR) {
357 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 358 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
358 $vbox->add (my $entry = new CFClient::UI::Entry 359 $vbox->add (my $entry = new CFClient::UI::Entry
359 connect_changed => sub { 360 on_changed => sub {
360 $self->send ("reply $_[1]"); 361 $self->send ("reply $_[1]");
361 $dialog->destroy; 362 $dialog->destroy;
362 }, 363 },
363 ); 364 );
364 365
367 } else { 368 } else {
368 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 369 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
369 370
370 $vbox->add (my $entry = new CFClient::UI::Entry 371 $vbox->add (my $entry = new CFClient::UI::Entry
371 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (), 372 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
372 connect_activate => sub { 373 on_activate => sub {
373 $self->send ("reply $_[1]"); 374 $self->send ("reply $_[1]");
374 $dialog->destroy; 375 $dialog->destroy;
375 }, 376 },
376 ); 377 );
377 378

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines