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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.353 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.359 by root, Fri Dec 8 15:07:08 2006 UTC

 );
 sub emit {
    my ($self, $signal, @args) = @_;
-   # I do not really like this solution, but I dislike duplication
+   # I do not really like this solution, but I do not like duplication
-   # and needlessly verbose code, too.
+   # and needlessly verbose code, either.
    my @append
       = $has_coords{$signal}
         ? $args[0]->xy ($self)
         : ();
       active_fg  => [0, 0, 0],
       can_hover  => 1,
       can_focus  => 1,
       valign     => 0,
       can_events => 1,
+      ellipsise  => 0,
       #text      => ...
       #hidden    => "*",
       @_
    )
 }
    }
    $self->_set_text ($text);
    $self->realloc;
+   $self->update;
    1
 }
 sub invoke_focus_in {
       glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
       glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
       glEnd;
    }
 }
+#############################################################################
 package CFPlus::UI::Entry;
 our @ISA = CFPlus::UI::EntryBase::;
          $self->set_text ($self->{history}->[$self->{history_pointer}]);
       } else {
          $self->set_text ($self->{history_saveback});
       }
+   } elsif ($ev->{unicode} >= 0x20) {
+      return $self->SUPER::invoke_key_down ($ev)
+   }
+   1
+}
+#############################################################################
+package CFPlus::UI::TextEdit;
+our @ISA = CFPlus::UI::EntryBase::;
+use CFPlus::OpenGL;
+sub move_cursor_ver {
+   my ($self, $dy) = @_;
+   my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
+   $y += $dy;
+   if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
+      $self->{cursor} = $index;
+      delete $self->{cur_h};
+      $self->update;
+      return;
+   }
+}
+sub invoke_key_down {
+   my ($self, $ev) = @_;
+   my $sym = $ev->{sym};
+   if ($sym == CFPlus::SDLK_UP) {
+      $self->move_cursor_ver (-1);
+   } elsif ($sym == CFPlus::SDLK_DOWN) {
+      $self->move_cursor_ver (+1);
    } else {
       return $self->SUPER::invoke_key_down ($ev)
    }
    1
             if ($ev->{button} == 1) {
                $::CONN->user_send ("cast $spell->{name}");
             } elsif ($ev->{button} == 2) {
                $::CONN->user_send ("invoke $spell->{name}");
             } elsif ($ev->{button} == 3) {
+               my $shortname = CFPlus::shorten $spell->{name}, 14;
                (new CFPlus::UI::Menu
                   items => [
-                     ["bind <i>cast $spell->{name}</i> to a key"   => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
+                     ["bind <i>cast $shortname</i> to a key"   => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
-                     ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
+                     ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
                   ],
                )->popup ($ev);
             } else {
                return 0;
             }

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.353 by root, Thu Nov 16 19:42:45 2006 UTC vs. Revision 1.359 by root, Fri Dec 8 15:07:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.353 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.359 by root, Fri Dec 8 15:07:08 2006 UTC