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.111 by root, Sat Apr 15 02:10:22 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 13:56:25 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}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for ($vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
… …
133 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
134 147
135 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
136} 149}
137 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
138# translate global coordinates to local coordinate system 158# translate global coordinates to local coordinate system
139sub translate { 159sub coord2local {
140 my ($self, $x, $y) = @_; 160 my ($self, $x, $y) = @_;
141 161
142 $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)
143} 172}
144 173
145sub focus_in { 174sub focus_in {
146 my ($self) = @_; 175 my ($self) = @_;
147 176
… …
220 249
221 () 250 ()
222} 251}
223 252
224sub set_parent { 253sub set_parent {
225 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
226 255
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
229}
230
231sub get_parent {
232 $_[0]->{parent}
233} 257}
234 258
235sub update { 259sub update {
236 my ($self) = @_; 260 my ($self) = @_;
237 261
… …
326 350
327 $self 351 $self
328} 352}
329 353
330sub add { 354sub add {
331 my ($self, $chld) = @_; 355 my ($self, $child) = @_;
332 356
333 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
334 360
335 $self->{children} = [ 361 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
338 ]; 364 ];
339 365
340 $self->{w} = $self->{h} = -1; 366 $self->{w} = $self->{h} = -1;
341 $self->update; 367 $self->update;
342} 368}
… …
672 @_ 698 @_
673 ) 699 )
674} 700}
675 701
676sub add { 702sub add {
677 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
678 704
705 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 707
682 $self->{w} = $self->{h} = -1; 708 $self->{w} = $self->{h} = -1;
683 $self->update; 709 $self->update;
684} 710}
685 711
… …
733 759
734 # linearly scale sizes 760 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 761 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 762 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 763
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems 764 CFClient::UI::harmonize $ws;
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems 765 CFClient::UI::harmonize $hs;
740 766
741 my $y; 767 my $y;
742 768
743 for my $r (0 .. $#{$self->{children}}) { 769 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r] 770 my $row = $self->{children}[$r]
… …
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 858 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 859 $h[$_] = $alloc_h;
834 } 860 }
835 } 861 }
836 862
863 CFClient::UI::harmonize \@h;
864
837 my $y = 0; 865 my $y = 0;
838 for (0 .. $#$children) { 866 for (0 .. $#$children) {
839 my $child = $children->[$_]; 867 my $child = $children->[$_];
840 my $h = int $h[$_]; 868 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 869 $child->size_allocate ($y, 0, $h, $w);
842 870
843 $y += $h; 871 $y += $h;
844 } 872 }
845} 873}
… …
886 914
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 915 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888 } 916 }
889 } 917 }
890 918
919 CFClient::UI::harmonize \@h;
920
891 my $y = 0; 921 my $y = 0;
892 for (0 .. $#$children) { 922 for (0 .. $#$children) {
893 my $child = $children->[$_]; 923 my $child = $children->[$_];
894 my $h = int $h[$_]; 924 my $h = $h[$_];
895 $child->size_allocate (0, $y, $w, $h); 925 $child->size_allocate (0, $y, $w, $h);
896 926
897 $y += $h; 927 $y += $h;
898 } 928 }
899} 929}
… …
1558 1588
1559 return unless $self->{h} > 0; 1589 return unless $self->{h} > 0;
1560 1590
1561 delete $self->{texture}; 1591 delete $self->{texture};
1562 1592
1563 $TOPLEVEL->on_refresh ($self, sub { 1593 $ROOT->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) { 1594 if (delete $self->{need_reflow}) {
1565 my $height = 0; 1595 my $height = 0;
1566 1596
1567 $height += $_->[0] = $self->text_height ($_->[2]) 1597 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}}; 1598 for @{$self->{par}};
… …
1928sub toggle_flopper { 1958sub toggle_flopper {
1929 my ($self) = @_; 1959 my ($self) = @_;
1930 1960
1931 # TODO: use animation 1961 # TODO: use animation
1932 if ($self->{state} = !$self->{state}) { 1962 if ($self->{state} = !$self->{state}) {
1933 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1963 $CFClient::UI::ROOT->add ($self->{other});
1934 $self->{other}->move ( 1964 $self->{other}->move ($self->coord2global (0, $self->{h}));
1935 ($::WIDTH - $self->{other}{w}) * 0.5, 1965 $self->emit ("open");
1936 ($::HEIGHT - $self->{other}{h}) * 0.5,
1937 );
1938 } else { 1966 } else {
1939 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1967 $CFClient::UI::ROOT->remove ($self->{other});
1968 $self->emit ("close");
1940 } 1969 }
1941}
1942 1970
1943############################################################################# 1971 $self->emit (changed => $self->{state});
1972}
1944 1973
1974#############################################################################
1975
1945package CFClient::UI::Toplevel; 1976package CFClient::UI::Root;
1946 1977
1947our @ISA = CFClient::UI::Container::; 1978our @ISA = CFClient::UI::Container::;
1948 1979
1949use SDL::OpenGL; 1980use SDL::OpenGL;
1950 1981
… …
1959 1990
1960 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1991 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1961 for @{$self->{children}}; 1992 for @{$self->{children}};
1962} 1993}
1963 1994
1964sub translate { 1995sub _topleft {
1965 my ($self, $x, $y) = @_; 1996 my ($self, $x, $y) = @_;
1966 1997
1967 ($x, $y) 1998 ($x, $y)
1968} 1999}
1969 2000
… …
2010 2041
2011############################################################################# 2042#############################################################################
2012 2043
2013package CFClient::UI; 2044package CFClient::UI;
2014 2045
2015$TOPLEVEL = new CFClient::UI::Toplevel; 2046$ROOT = new CFClient::UI::Root;
2016 2047
20171 20481
2018 2049

Diff Legend

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