ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

… …
113 } 113 }
114 114
115 if ($GRAB) { 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 117 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
120 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
121 } else { 125 } else {
122 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
123 } 127 }
124 } 128 }
… …
547 551
548 # parent 552 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 554}
551 555
552sub find_widget { 556#sub find_widget {
553 my ($self, $x, $y) = @_; 557# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 558
564sub set_parent { 559sub set_parent {
565 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
566 561
567 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
1020 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
1021 1016
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1019 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1021 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1023 }
1029} 1024}
1030 1025
… …
1093 1088
1094 0 1089 0
1095 }, 1090 },
1096 ; 1091 ;
1097 1092
1098 $self->SUPER::add (0, 0, $self->{vp}); 1093 $self->SUPER::add_at (0, 0, $self->{vp});
1099 1094
1100 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1101 1096
1102 $self 1097 $self
1103} 1098}
… …
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1115
1121 my $visible = $w1 > $w2; 1116 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1117 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide; 1119 : $self->{hslider}->hide;
1125 } 1120 }
1126 1121
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1124
1130 my $visible = $h1 > $h2; 1125 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1126 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide; 1128 : $self->{vslider}->hide;
1134 } 1129 }
1135} 1130}
1136 1131
1137sub update { 1132sub update {
1138 my ($self) = @_; 1133 my ($self) = @_;
1139 1134
1135 $self->update_slider;
1140 $self->SUPER::update; 1136 $self->SUPER::update;
1141 $self->update_slider;
1142} 1137}
1143 1138
1144sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1146 1141
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1150 1147
1151 1 1148 1
1152} 1149}
1153 1150
1154sub invoke_button_down { 1151sub invoke_button_down {
… …
1607 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1608} 1605}
1609 1606
1610# TODO: store row/col info in child widget and use standard add/del 1607# TODO: store row/col info in child widget and use standard add/del
1611sub add { 1608sub add {
1612 my ($self) = shift; 1609 my $self = shift;
1610
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1612 $self->add_at (@_);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1613 1617
1614 while (@_) { 1618 while (@_) {
1615 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1616 $child->set_parent ($self); 1621 $child->set_parent ($self);
1617 $self->{children}[$y][$x] = $child; 1622 $self->{children}[$row][$col] = $child;
1618 } 1623 }
1619 1624
1620 $self->{force_realloc} = 1; 1625 $self->{force_realloc} = 1;
1621 $self->{force_size_alloc} = 1; 1626 $self->{force_size_alloc} = 1;
1622 $self->realloc; 1627 $self->realloc;

Diff Legend

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