[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC vs.
Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC

    my ($self, $flags, $prompt) = @_;
    $prompt = $LAST_QUERY unless length $prompt;
    $LAST_QUERY = $prompt;
-   my $dialog = new CFClient::UI::FancyFrame
+   $self->{query}-> ($self, $flags, $prompt);
-      x     => "center",
-      y     => "center",
-      title => "Query",
-      child => my $vbox = new CFClient::UI::VBox,
-   ;
-   $vbox->add (new CFClient::UI::Label
-      max_w => $::WIDTH * 0.4,
-      ellipsise => 0,
-      text => $prompt);
-   if ($flags & CS_QUERY_YESNO) {
-      $vbox->add (my $hbox = new CFClient::UI::HBox);
-      $hbox->add (new CFClient::UI::Button
-         text => "No",
-         on_activate => sub {
-            $self->send ("reply n");
-            $dialog->destroy;
-            $self->{map_widget}->focus_in;
-         }
-      );
-      $hbox->add (new CFClient::UI::Button
-         text => "Yes",
-         on_activate => sub {
-            $self->send ("reply y");
-            $dialog->destroy;
-         },
-      );
-      $dialog->focus_in;
-   } elsif ($flags & CS_QUERY_SINGLECHAR) {
-      $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
-      $vbox->add (my $entry = new CFClient::UI::Entry
-         on_changed => sub {
-            $self->send ("reply $_[1]");
-            $dialog->destroy;
-         },
-      );
-      $entry->focus_in;
-   } else {
-      $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
-      $vbox->add (my $entry = new CFClient::UI::Entry
-         $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
-         on_activate => sub {
-            $self->send ("reply $_[1]");
-            $dialog->destroy;
-         },
-      );
-      $entry->focus_in;
-   }
-   $dialog->show;
 }
 sub drawinfo {
    my ($self, $color, $text) = @_;
       [0.74, 0.65, 0.41],
    );
    my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
+   # try to create single paragraphs of multiple lines sent by the server
+   $text =~ s/(?<=\S)\n(?=\w)/ /g;
    $text = CFClient::UI::Label::escape $text;
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
    $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
    $self->{logview}->add_paragraph ($color[$color],
 }
 sub spell_add {
    my ($self, $spell) = @_;
-   # TODO
+   # try to create single paragraphs of multiple lines sent by the server
-   # create a widget dynamically, using spell face (CF::Protocol downloads them)
+   $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
+   $spell->{message} =~ s/\n+$//;
+   $spell->{message} ||= "Server did not provide a description for this spell.";
    $::SETUP_SPELLS->add_spell ($spell);
    $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
    $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
 }
       $::FLOORBOX->clear;
       my $row;
       for (@{ $::CONN->{container}{0} }) {
-         if ($row < 7) {
+         if ($row < 6) {
             local $_->{face_widget}; # hack to force recreation of widget
             local $_->{desc_widget}; # hack to force recreation of widget
             CFClient::Item::update_widgets $_;
             $::FLOORBOX->add (0, $row, $_->{face_widget});
             $::FLOORBOX->add (1, $row, $_->{desc_widget});
             $row++;
          } else {
-            $::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");
+            $::FLOORBOX->add (1, $row, new CFClient::UI::Button
+               text        => "More...",
+               on_activate => sub { $::INV_WINDOW->toggle_visibility },
+            );
             last;
          }
       }
    });
    }
 }
 sub player_update {
    my ($self, $player) = @_;
    $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
+}
-   # do it here because it is ignored earlier, and there is no "login" event
+sub logged_in {
+   my ($self) = @_;
+   $self->send_ext_req (cfplus => "version", "1", sub {
+      $self->{cfplus_ext} = $_[0];
+   });
    $self->send_command ("output-sync $::CFG->{output_sync}");
    $self->send_command ("output-count $::CFG->{output_count}");
+   $self->send_command ("pickup $::CFG->{pickup}");
+   my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
+   $::SERVER_INFO->set_markup (
+      "server <tt>$self->{host}:$self->{port}</tt>\n"
+    . "protocol version <tt>$self->{version}</tt>\n"
+    . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
+    . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
+    . "cfplus support $yesno[$self->{cfplus_ext} > 0]\n"
+    . "map size $self->{mapw}×$self->{maph}\n"
+   );
 }
 1;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC vs. Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC vs.
Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC