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.107 by root, Fri Apr 14 20:27:35 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 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;
709 $self->update;
710}
711
712# TODO: move to container class maybe? send childs a signal on removal?
713sub clear {
714 my ($self) = @_;
715
716 delete $self->{children};
683 $self->update; 717 $self->update;
684} 718}
685 719
686sub get_wh { 720sub get_wh {
687 my ($self) = @_; 721 my ($self) = @_;
… …
733 767
734 # linearly scale sizes 768 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 771
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems 772 CFClient::UI::harmonize $ws;
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems 773 CFClient::UI::harmonize $hs;
740 774
741 my $y; 775 my $y;
742 776
743 for my $r (0 .. $#{$self->{children}}) { 777 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r] 778 my $row = $self->{children}[$r]
… …
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 866 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 867 $h[$_] = $alloc_h;
834 } 868 }
835 } 869 }
836 870
871 CFClient::UI::harmonize \@h;
872
837 my $y = 0; 873 my $y = 0;
838 for (0 .. $#$children) { 874 for (0 .. $#$children) {
839 my $child = $children->[$_]; 875 my $child = $children->[$_];
840 my $h = int $h[$_]; 876 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 877 $child->size_allocate ($y, 0, $h, $w);
842 878
843 $y += $h; 879 $y += $h;
844 } 880 }
845} 881}
… …
886 922
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888 } 924 }
889 } 925 }
890 926
927 CFClient::UI::harmonize \@h;
928
891 my $y = 0; 929 my $y = 0;
892 for (0 .. $#$children) { 930 for (0 .. $#$children) {
893 my $child = $children->[$_]; 931 my $child = $children->[$_];
894 my $h = int $h[$_]; 932 my $h = $h[$_];
895 $child->size_allocate (0, $y, $w, $h); 933 $child->size_allocate (0, $y, $w, $h);
896 934
897 $y += $h; 935 $y += $h;
898 } 936 }
899} 937}
… …
1558 1596
1559 return unless $self->{h} > 0; 1597 return unless $self->{h} > 0;
1560 1598
1561 delete $self->{texture}; 1599 delete $self->{texture};
1562 1600
1563 $TOPLEVEL->on_refresh ($self, sub { 1601 $ROOT->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) { 1602 if (delete $self->{need_reflow}) {
1565 my $height = 0; 1603 my $height = 0;
1566 1604
1567 $height += $_->[0] = $self->text_height ($_->[2]) 1605 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}}; 1606 for @{$self->{par}};
… …
1655} 1693}
1656 1694
1657sub key_up { 1695sub key_up {
1658} 1696}
1659 1697
1698sub button_down {
1699 my ($self, $ev, $x, $y) = @_;
1700
1701 $self->focus_in;
1702
1703 if ($ev->button == 2) {
1704 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1705 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1706
1707 $self->{motion} = sub {
1708 my ($ev, $x, $y) = @_;
1709
1710 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1711
1712 $::CFG->{map_shift_x} = $bw + $x - $ox;
1713 $::CFG->{map_shift_y} = $bh + $y - $oy;
1714
1715 $self->update;
1716 };
1717 }
1718}
1719
1720sub button_up {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 delete $self->{motion};
1724}
1725
1726sub mouse_motion {
1727 my ($self, $ev, $x, $y) = @_;
1728
1729 $self->{motion}->($ev, $x, $y) if $self->{motion};
1730}
1731
1660sub size_request { 1732sub size_request {
1661 ( 1733 (
1662 1 + 32 * int $::WIDTH / 32, 1734 1 + 32 * int $::WIDTH / 32,
1663 1 + 32 * int $::HEIGHT / 32, 1735 1 + 32 * int $::HEIGHT / 32,
1664 ) 1736 )
… …
1672} 1744}
1673 1745
1674sub draw { 1746sub draw {
1675 my ($self) = @_; 1747 my ($self) = @_;
1676 1748
1677 $self->{need_update}++;#d#
1678 if (delete $self->{need_update}) { 1749 if (delete $self->{need_update}) {
1679 glNewList $self->{list}, GL_COMPILE; 1750 glNewList $self->{list}, GL_COMPILE;
1680 1751
1681 my $sw = int $::WIDTH / 32;
1682 my $sh = int $::HEIGHT / 32;
1683
1684 if ($::MAP) { 1752 if ($::MAP) {
1753 my $sw = int $::WIDTH / 32;
1754 my $sh = int $::HEIGHT / 32;
1755
1756 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1757 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1758
1759 glTranslate $sx0 - 32, $sy0 - 32, 0;
1760
1685 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1761 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1686 1762
1687 if ($::CFG->{fow_enable}) { 1763 if ($::CFG->{fow_enable}) {
1688 if ($::CFG->{fow_smooth}) { # smooth fog of war 1764 if ($::CFG->{fow_smooth}) { # smooth fog of war
1689 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1765 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1690 glConvolutionFilter2D 1766 glConvolutionFilter2D
… …
1708 format => GL_ALPHA; 1784 format => GL_ALPHA;
1709 1785
1710 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1786 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1711 1787
1712 glEnable GL_BLEND; 1788 glEnable GL_BLEND;
1789 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1713 glEnable GL_TEXTURE_2D; 1790 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1715 1792
1716 glColor +($::CFG->{fow_intensity}) x 3, 1; 1793 glColor +($::CFG->{fow_intensity}) x 3, 1;
1717 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1794 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1718 1795
1719 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1720 glDisable GL_BLEND; 1797 glDisable GL_BLEND;
1721 } 1798 }
1799
1800 # HACK BEGIN
1801 {
1802 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1803 my ($w, $h) = (250, 250);
1804
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809
1810 CFClient::Texture->new (
1811 w => $w,
1812 h => $h,
1813 data => $::MAP->mapmap ($w, $h),
1814 type => GL_UNSIGNED_INT_8_8_8_8_REV
1815 )->draw_quad (100, 100);
1816
1817 glDisable GL_TEXTURE_2D;
1818 glDisable GL_BLEND;
1819 }
1820 # HACK END
1722 } 1821 }
1723 1822
1724 glEndList; 1823 glEndList;
1725 } 1824 }
1726 1825
1826 glPushMatrix;
1727 glCallList $self->{list}; 1827 glCallList $self->{list};
1828 glPopMatrix;
1728 1829
1729 if ($FOCUS != $self) { 1830 if ($FOCUS != $self) {
1730 glColor 64/255, 64/255, 64/255; 1831 glColor 64/255, 64/255, 64/255;
1731 glLogicOp GL_AND; 1832 glLogicOp GL_AND;
1732 glEnable GL_COLOR_LOGIC_OP; 1833 glEnable GL_COLOR_LOGIC_OP;
… …
1865sub toggle_flopper { 1966sub toggle_flopper {
1866 my ($self) = @_; 1967 my ($self) = @_;
1867 1968
1868 # TODO: use animation 1969 # TODO: use animation
1869 if ($self->{state} = !$self->{state}) { 1970 if ($self->{state} = !$self->{state}) {
1870 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1971 $CFClient::UI::ROOT->add ($self->{other});
1871 $self->{other}->move ( 1972 $self->{other}->move ($self->coord2global (0, $self->{h}));
1872 ($::WIDTH - $self->{other}{w}) * 0.5, 1973 $self->emit ("open");
1873 ($::HEIGHT - $self->{other}{h}) * 0.5,
1874 );
1875 } else { 1974 } else {
1876 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1975 $CFClient::UI::ROOT->remove ($self->{other});
1976 $self->emit ("close");
1877 } 1977 }
1878}
1879 1978
1880############################################################################# 1979 $self->emit (changed => $self->{state});
1980}
1881 1981
1982#############################################################################
1983
1882package CFClient::UI::Toplevel; 1984package CFClient::UI::Root;
1883 1985
1884our @ISA = CFClient::UI::Container::; 1986our @ISA = CFClient::UI::Container::;
1885 1987
1886use SDL::OpenGL; 1988use SDL::OpenGL;
1887 1989
… …
1896 1998
1897 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1999 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1898 for @{$self->{children}}; 2000 for @{$self->{children}};
1899} 2001}
1900 2002
1901sub translate { 2003sub _topleft {
1902 my ($self, $x, $y) = @_; 2004 my ($self, $x, $y) = @_;
1903 2005
1904 ($x, $y) 2006 ($x, $y)
1905} 2007}
1906 2008
… …
1947 2049
1948############################################################################# 2050#############################################################################
1949 2051
1950package CFClient::UI; 2052package CFClient::UI;
1951 2053
1952$TOPLEVEL = new CFClient::UI::Toplevel; 2054$ROOT = new CFClient::UI::Root;
1953 2055
19541 20561
1955 2057

Diff Legend

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