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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.198 by root, Tue May 20 02:49:56 2008 UTC vs.
Revision 1.208 by root, Sun Jan 11 03:19:47 2009 UTC

 use DC::Pod;
 use DC::Macro;
 use DC::Item;
 use base 'Deliantra::Protocol::Base';
+our $TEX_DIALOGUE = new_from_resource DC::Texture
+         "dialogue.png", minify => 1, mipmap => 1;
+our $TEX_NOFACE = new_from_resource DC::Texture
+        "noface.png", minify => 1, mipmap => 1;
+our $TEX_HIDDEN = new_from_resource DC::Texture
+        "hidden.png", minify => 1, mipmap => 1;
+sub MIN_TEXTURE_UNUSED() { 1 }#d#
 sub new {
    my ($class, %arg) = @_;
    my $self = $class->SUPER::new (%arg,
             for values %{delete $ws->{w} || {}};
       }
       delete $self->{items};
       $::INV->clear;
+      $::INVR->clear;
       $::INVR_HB->clear;
       $::FLOORBOX->clear;
    });
    $self->{map_widget}->add_command (@$_)
       for @cmd_help;
    {
-      $self->{dialogue} = my $tex = new_from_file DC::Texture
+      $self->{dialogue} = my $tex = $TEX_DIALOGUE;
-         DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
       $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
    }
    {
-     $self->{noface} = my $tex = new_from_file DC::Texture
+      $self->{noface} = my $tex = $TEX_NOFACE;
-        DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
       $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
    }
+   {
+      $self->{hidden} = my $tex = $TEX_HIDDEN;
+      $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+   }
+#   $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
+#   $self->{expire_w} = EV::timer 1, 1, sub {
+#      my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
+#
+#      for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
+#         warn DC::SvREFCNT $self->{texture}[$_];
+#         $self->{texture}[$_]->unload;
+#         warn "expire texture $_\n";#d#
+#      }
+#
+#      ($self->{expire_count} += $count) < @{ $self->{texture} }
+#         or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
+#      warn "count is $count\n";#d#
+#   };
    $self->{open_container} = 0;
    # per server
    $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
    my %wkw = (
       root           => $DC::UI::ROOT,
       tooltip        => $DC::UI::TOOLTIP,
       mapwidget      => $::MAPWIDGET,
+      menubar        => $::MENUBAR,
+      menupopup      => $::MENUPOPUP,
       buttonbar      => $::BUTTONBAR,
       metaserver     => $::METASERVER,
       buttonbar      => $::BUTTONBAR,
       login_button   => $::LOGIN_BUTTON,
       quit_dialog    => $::QUIT_DIALOG,
       floorbox       => $::FLOORBOX,
       help_window    => $::HELP_WINDOW,
       message_window => $::MESSAGE_WINDOW,
       message_dist   => $::MESSAGE_DIST,
-      statusbox      => $::SDTATUSBOX,
+      statusbox      => $::STATUSBOX,
       inv            => $::INV,
       invr           => $::INVR,
       invr_hb        => $::INVR_HB,
    );
          7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
       ];
       my @add = @$sw;
-      my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
+      my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
       my @TOOLTIP_LVL  = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
       my @TOOLTIP_EXP  = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
       my ($x, $y) = (0, 1);
 }
 sub map_scroll {
    my ($self, $dx, $dy) = @_;
-   $self->{map}->scroll ($dx, $dy);
+   $self->{map_widget}->scroll ($dx, $dy);
 }
 sub feed_map1a {
    my ($self, $data) = @_;
    for my $tile (@$missing) {
       next if $self->{delay}{$tile};
       $delay = 1;
-      if (my $tex = $::CONN->{texture}[$tile]) {
+      if (my $tex = $self->{texture}[$tile]) {
          $tex->upload;
       } else {
          $self->{delay}{$tile} = 1;
-         # we assume the face is in-flight and will eventually come
+         # we assume the face is in-flight and will eventually arrive
          push @{$self->{tile_cb}{$tile}}, sub {
             delete $self->{delay}{$tile};
             $_[0]->upload;
          };
       }
    }
    if ($delay) {
-      # delay the map drawing a tiny bit in the hope of getting the missing fetched
+      # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
       EV::once undef, 0, 0.03, sub {
          $self->{map_widget}->update
             if $self->{map_widget};
       };
    } else {
       ## try to create single paragraphs of multiple lines sent by the server
       # no longer neecssary with TRT servers
       #$text =~ s/(?<=\S)\n(?=\w)/ /g;
-      for (split /\n/, $text) {
-         ::message ({
+      ::message ({
-            fg     => $fg,
+         fg     => $fg,
-            markup => $_,
+         markup => $text,
-            type   => $type,
+         type   => $type,
-            extra  => [@extra],
+         extra  => [@extra],
-            color_flags => $color, #d# ugly, kill
+         color_flags => $color, #d# ugly, kill
-         });
+      });
-         $color &= ~NDI_CLEAR; # only clear once for multiline messages
+#      $color &= ~NDI_CLEAR; # only clear once for multiline messages
-         # actually, this is an ugly design. _we_ should control the channels,
+#      # actually, this is an ugly design. _we_ should control the channels,
-         # not some random other widget, as the channels are clearly protocol-specific.
+#      # not some random other widget, as the channels are clearly protocol-specific.
-         # then we could also react to flags such as CLEAR without resorting to
+#      # then we could also react to flags such as CLEAR without resorting to
-         # hacks such as color_flags, above.
+#      # hacks such as color_flags, above.
-      }
       $self->{statusbox}->add ($text,
          group        => $text,
          fg           => $fg,
          timeout      => $color >= 2 ? 180 : 10,
    $self->update_server_info;
    $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
    $self->send_command ("pickup $::CFG->{pickup}");
+   $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
+                                              DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
 }
 sub lookat {
    my ($self, $x, $y) = @_;
 }
 sub send {
    my ($self, $msg) = @_;
-   $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
+   $self->{textview}->add_paragraph ({
+      markup =>
+         "\n<span foreground='#ffff00'><b>"
+         . (DC::asxml $msg)
+         . "</b></span>"
+   });
    $self->{textview}->scroll_to_bottom;
    $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
 }

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.198 by root, Tue May 20 02:49:56 2008 UTC vs. Revision 1.208 by root, Sun Jan 11 03:19:47 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.198 by root, Tue May 20 02:49:56 2008 UTC vs.
Revision 1.208 by root, Sun Jan 11 03:19:47 2009 UTC