--- deliantra/Deliantra-Client/DC/UI.pm 2006/06/02 09:02:49 1.270 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/06/02 22:13:47 1.271 @@ -441,15 +441,17 @@ unless $FOCUS; } -sub mouse_motion { } -sub button_up { } -sub key_down { } -sub key_up { } +sub mouse_motion { 0 } +sub button_up { 0 } +sub key_down { 0 } +sub key_up { 0 } sub button_down { my ($self, $ev, $x, $y) = @_; $self->focus_in; + + 0 } sub find_widget { @@ -1159,19 +1161,25 @@ $self->move_abs ($bx + $x - $ox, $by + $y - $oy); }; + } else { + return 0; } + + 1 } sub button_up { my ($self, $ev, $x, $y) = @_; - delete $self->{motion}; + !!delete $self->{motion} } sub mouse_motion { my ($self, $ev, $x, $y) = @_; $self->{motion}->($ev, $x, $y) if $self->{motion}; + + !!$self->{motion} } sub _draw { @@ -1711,11 +1719,15 @@ $self->_emit ('escape'); } elsif ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; + } else { + return 0; } $self->_set_text ($text); $self->realloc; + + 1 } sub focus_in { @@ -1740,11 +1752,15 @@ $self->_set_text ($self->{text}); $self->update; + + 1 } sub mouse_motion { my ($self, $ev, $x, $y) = @_; # printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# + + 0 } sub _draw { @@ -1831,9 +1847,10 @@ } } else { - $self->SUPER::key_down ($ev); + return $self->SUPER::key_down ($ev) } + 1 } ############################################################################# @@ -1872,6 +1889,8 @@ $self->emit ("activate") if $x >= 0 && $x < $self->{w} && $y >= 0 && $y < $self->{h}; + + 1 } sub _draw { @@ -1935,7 +1954,11 @@ && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { $self->{state} = !$self->{state}; $self->_emit (changed => $self->{state}); + } else { + return 0 } + + 1 } sub _draw { @@ -2283,7 +2306,7 @@ $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; - $self->mouse_motion ($ev, $x, $y); + $self->mouse_motion ($ev, $x, $y) } sub mouse_motion { @@ -2297,7 +2320,11 @@ $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); + } else { + return 0; } + + 1 } sub update { @@ -2885,6 +2912,8 @@ # TODO: should use vbox->find_widget or so $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); $self->{hover} = $self->{item}{$HOVER}; + + 0 } sub button_up { @@ -2896,7 +2925,11 @@ $self->_emit ("popdown"); $self->{hover}[1]->() if $self->{hover}; + } else { + return 0 } + + 1 } #############################################################################