--- deliantra/Deliantra-Client/DC/UI.pm	2006/12/08 15:07:08	1.359
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/12/08 22:25:32	1.360
@@ -1969,12 +1969,12 @@
       $self->{cursor} = 0;
    } elsif ($sym == CFPlus::SDLK_END) {
       $self->{cursor} = length $text;
-   } elsif ($uni ==  21) { # ctrl-u
+   } elsif ($uni == 21) { # ctrl-u
       $text = "";
       $self->{cursor} = 0;
    } elsif ($uni == 27) {
       $self->emit ('escape');
-   } elsif ($uni) {
+   } elsif ($uni >= 0x20 || $uni == 0x0d) {
       substr $text, $self->{cursor}++, 0, chr $uni;
    } else {
       return 0;
@@ -2075,7 +2075,7 @@
 
    my $sym = $ev->{sym};
 
-   if ($sym == 13) {
+   if ($ev->{uni} == 0x0d || $sym == 13) {
       unshift @{$self->{history}},
          my $txt = $self->get_text;
 
@@ -2106,7 +2106,7 @@
          $self->set_text ($self->{history_saveback});
       }
 
-   } elsif ($ev->{unicode} >= 0x20) {
+   } else {
       return $self->SUPER::invoke_key_down ($ev)
    }