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.112 by root, Sat Apr 15 12:29:46 2006 UTC vs.
Revision 1.113 by root, Sat Apr 15 12:46:48 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47 47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover && $hover->{can_hover}; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71} 71}
72 72
73# convert position array to integers 73# convert position array to integers
74sub harmonize { 74sub harmonize {
75 my ($vals) = @_; 75 my ($vals) = @_;
… …
146 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
147 147
148 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
149} 149}
150 150
151# return top left coordinates
152sub _topleft {
153 my ($self, $x, $y) = @_;
154
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
151# translate global coordinates to local coordinate system 158# translate global coordinates to local coordinate system
152sub translate { 159sub coord2local {
153 my ($self, $x, $y) = @_; 160 my ($self, $x, $y) = @_;
154 161
155 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
156} 172}
157 173
158sub focus_in { 174sub focus_in {
159 my ($self) = @_; 175 my ($self) = @_;
160 176
… …
233 249
234 () 250 ()
235} 251}
236 252
237sub set_parent { 253sub set_parent {
238 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
239 255
240 $self->{parent} = $par;
241 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
242}
243
244sub get_parent {
245 $_[0]->{parent}
246} 257}
247 258
248sub update { 259sub update {
249 my ($self) = @_; 260 my ($self) = @_;
250 261
… …
339 350
340 $self 351 $self
341} 352}
342 353
343sub add { 354sub add {
344 my ($self, $chld) = @_; 355 my ($self, $child) = @_;
345 356
346 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
347 360
348 $self->{children} = [ 361 $self->{children} = [
349 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
350 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
351 ]; 364 ];
352 365
353 $self->{w} = $self->{h} = -1; 366 $self->{w} = $self->{h} = -1;
354 $self->update; 367 $self->update;
355} 368}
… …
685 @_ 698 @_
686 ) 699 )
687} 700}
688 701
689sub add { 702sub add {
690 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
691 704
705 $child->set_parent ($self);
692 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
693 $chld->set_parent ($self);
694 707
695 $self->{w} = $self->{h} = -1; 708 $self->{w} = $self->{h} = -1;
696 $self->update; 709 $self->update;
697} 710}
698 711
… …
1575 1588
1576 return unless $self->{h} > 0; 1589 return unless $self->{h} > 0;
1577 1590
1578 delete $self->{texture}; 1591 delete $self->{texture};
1579 1592
1580 $TOPLEVEL->on_refresh ($self, sub { 1593 $ROOT->on_refresh ($self, sub {
1581 if (delete $self->{need_reflow}) { 1594 if (delete $self->{need_reflow}) {
1582 my $height = 0; 1595 my $height = 0;
1583 1596
1584 $height += $_->[0] = $self->text_height ($_->[2]) 1597 $height += $_->[0] = $self->text_height ($_->[2])
1585 for @{$self->{par}}; 1598 for @{$self->{par}};
… …
1945sub toggle_flopper { 1958sub toggle_flopper {
1946 my ($self) = @_; 1959 my ($self) = @_;
1947 1960
1948 # TODO: use animation 1961 # TODO: use animation
1949 if ($self->{state} = !$self->{state}) { 1962 if ($self->{state} = !$self->{state}) {
1950 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1963 $CFClient::UI::ROOT->add ($self->{other});
1951 $self->{other}->move ( 1964 $self->{other}->move ($self->coord2global (0, $self->{h}));
1952 ($::WIDTH - $self->{other}{w}) * 0.5,
1953 ($::HEIGHT - $self->{other}{h}) * 0.5,
1954 );
1955 } else { 1965 } else {
1956 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1966 $CFClient::UI::ROOT->remove ($self->{other});
1957 } 1967 }
1958} 1968}
1959 1969
1960############################################################################# 1970#############################################################################
1961 1971
1962package CFClient::UI::Toplevel; 1972package CFClient::UI::Root;
1963 1973
1964our @ISA = CFClient::UI::Container::; 1974our @ISA = CFClient::UI::Container::;
1965 1975
1966use SDL::OpenGL; 1976use SDL::OpenGL;
1967 1977
… …
1976 1986
1977 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1987 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1978 for @{$self->{children}}; 1988 for @{$self->{children}};
1979} 1989}
1980 1990
1981sub translate { 1991sub _topleft {
1982 my ($self, $x, $y) = @_; 1992 my ($self, $x, $y) = @_;
1983 1993
1984 ($x, $y) 1994 ($x, $y)
1985} 1995}
1986 1996
… …
2027 2037
2028############################################################################# 2038#############################################################################
2029 2039
2030package CFClient::UI; 2040package CFClient::UI;
2031 2041
2032$TOPLEVEL = new CFClient::UI::Toplevel; 2042$ROOT = new CFClient::UI::Root;
2033 2043
20341 20441
2035 2045

Diff Legend

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