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.118 by root, Sat Apr 15 23:25:00 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) = @_;
76 76
77 my $rem = 0; 77 my $rem = 0;
78 78
79 for ($vals) { 79 for (@$vals) {
80 my $i = int $_ + $rem; 80 my $i = int $_ + $rem;
81 $rem += $_ - $i; 81 $rem += $_ - $i;
82 $_ = $i; 82 $_ = $i;
83 } 83 }
84} 84}
… …
112 $self 112 $self
113} 113}
114 114
115sub move { 115sub move {
116 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
117 $self->{x} = $x; 117 $self->{x} = int $x;
118 $self->{y} = $y; 118 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
120} 120}
121 121
122sub needs_redraw { 122sub needs_redraw {
123 0 123 0
… …
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}
… …
552 # TODO: user_x, user_y, overwrite moveto? 565 # TODO: user_x, user_y, overwrite moveto?
553 566
554 $class->SUPER::new ( 567 $class->SUPER::new (
555 bg => [1, 1, 1, 1], 568 bg => [1, 1, 1, 1],
556 border_bg => [1, 1, 1, 1], 569 border_bg => [1, 1, 1, 1],
557 border => $::FONTSIZE * 0.8, 570 border => int $::FONTSIZE * 0.8,
558 @_ 571 @_
559 ) 572 )
560} 573}
561 574
562sub size_request { 575sub size_request {
… …
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;
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};
696 $self->update; 717 $self->update;
697} 718}
698 719
699sub get_wh { 720sub get_wh {
700 my ($self) = @_; 721 my ($self) = @_;
… …
929 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
930 fg => [1, 1, 1], 951 fg => [1, 1, 1],
931 fontsize => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
932 text => "", 953 text => "",
933 align => -1, 954 align => -1,
955 valign => -1,
934 padding => 2, 956 padding => 2,
935 layout => new CFClient::Layout, 957 layout => new CFClient::Layout,
936 %arg 958 %arg
937 ); 959 );
938 960
… …
1015 my $x = 1037 my $x =
1016 $self->{align} < 0 ? $self->{padding} 1038 $self->{align} < 0 ? $self->{padding}
1017 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1018 : ($self->{w} - $tex->{w}) * 0.5; 1040 : ($self->{w} - $tex->{w}) * 0.5;
1019 1041
1020 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1042 my $y =
1043 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5;
1046
1047 $tex->draw_quad (int $x, int $y);
1021 1048
1022 glDisable GL_TEXTURE_2D; 1049 glDisable GL_TEXTURE_2D;
1023 glDisable GL_BLEND; 1050 glDisable GL_BLEND;
1024} 1051}
1025 1052
… …
1040 bg => [0, 0, 0, 0.2], 1067 bg => [0, 0, 0, 0.2],
1041 active_bg => [1, 1, 1, 0.5], 1068 active_bg => [1, 1, 1, 0.5],
1042 active_fg => [0, 0, 0], 1069 active_fg => [0, 0, 0],
1043 can_hover => 1, 1070 can_hover => 1,
1044 can_focus => 1, 1071 can_focus => 1,
1072 valign => 0,
1045 @_ 1073 @_
1046 ) 1074 )
1047} 1075}
1048 1076
1049sub _set_text { 1077sub _set_text {
… …
1575 1603
1576 return unless $self->{h} > 0; 1604 return unless $self->{h} > 0;
1577 1605
1578 delete $self->{texture}; 1606 delete $self->{texture};
1579 1607
1580 $TOPLEVEL->on_refresh ($self, sub { 1608 $ROOT->on_refresh ($self, sub {
1581 if (delete $self->{need_reflow}) { 1609 if (delete $self->{need_reflow}) {
1582 my $height = 0; 1610 my $height = 0;
1583 1611
1584 $height += $_->[0] = $self->text_height ($_->[2]) 1612 $height += $_->[0] = $self->text_height ($_->[2])
1585 for @{$self->{par}}; 1613 for @{$self->{par}};
… …
1753 0.1, 0.1, 0.1, 1781 0.1, 0.1, 0.1,
1754 ; 1782 ;
1755 glEnable GL_CONVOLUTION_2D; 1783 glEnable GL_CONVOLUTION_2D;
1756 } 1784 }
1757 1785
1758 my $tex = new CFClient::Texture 1786 $self->{fow_texture} = new CFClient::Texture
1759 w => $w, 1787 w => $w,
1760 h => $h, 1788 h => $h,
1761 data => $data, 1789 data => $data,
1762 internalformat => GL_ALPHA, 1790 internalformat => GL_ALPHA,
1763 format => GL_ALPHA; 1791 format => GL_ALPHA;
… …
1768 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1769 glEnable GL_TEXTURE_2D; 1797 glEnable GL_TEXTURE_2D;
1770 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1798 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1771 1799
1772 glColor +($::CFG->{fow_intensity}) x 3, 1; 1800 glColor +($::CFG->{fow_intensity}) x 3, 1;
1773 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1801 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1774 1802
1775 glDisable GL_TEXTURE_2D; 1803 glDisable GL_TEXTURE_2D;
1776 glDisable GL_BLEND; 1804 glDisable GL_BLEND;
1777 } 1805 }
1778 1806
… …
1784 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1785 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1786 glEnable GL_TEXTURE_2D; 1814 glEnable GL_TEXTURE_2D;
1787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1788 1816
1817 $self->{mapmap_texture} =
1789 CFClient::Texture->new ( 1818 new CFClient::Texture
1790 w => $w, 1819 w => $w,
1791 h => $h, 1820 h => $h,
1792 data => $::MAP->mapmap ($w, $h), 1821 data => $::MAP->mapmap ($w, $h),
1793 type => GL_UNSIGNED_INT_8_8_8_8_REV 1822 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1794 )->draw_quad (100, 100); 1823
1824 $self->{mapmap_texture}->draw_quad (100, 100);
1795 1825
1796 glDisable GL_TEXTURE_2D; 1826 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND; 1827 glDisable GL_BLEND;
1798 } 1828 }
1799 # HACK END 1829 # HACK END
… …
1945sub toggle_flopper { 1975sub toggle_flopper {
1946 my ($self) = @_; 1976 my ($self) = @_;
1947 1977
1948 # TODO: use animation 1978 # TODO: use animation
1949 if ($self->{state} = !$self->{state}) { 1979 if ($self->{state} = !$self->{state}) {
1950 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1980 $CFClient::UI::ROOT->add ($self->{other});
1951 $self->{other}->move ( 1981 $self->{other}->move ($self->coord2global (0, $self->{h}));
1952 ($::WIDTH - $self->{other}{w}) * 0.5, 1982 $self->emit ("open");
1953 ($::HEIGHT - $self->{other}{h}) * 0.5,
1954 );
1955 } else { 1983 } else {
1956 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1984 $CFClient::UI::ROOT->remove ($self->{other});
1985 $self->emit ("close");
1957 } 1986 }
1958}
1959 1987
1960############################################################################# 1988 $self->emit (changed => $self->{state});
1989}
1961 1990
1991#############################################################################
1992
1962package CFClient::UI::Toplevel; 1993package CFClient::UI::Root;
1963 1994
1964our @ISA = CFClient::UI::Container::; 1995our @ISA = CFClient::UI::Container::;
1965 1996
1966use SDL::OpenGL; 1997use SDL::OpenGL;
1967 1998
… …
1976 2007
1977 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2008 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1978 for @{$self->{children}}; 2009 for @{$self->{children}};
1979} 2010}
1980 2011
1981sub translate { 2012sub _topleft {
1982 my ($self, $x, $y) = @_; 2013 my ($self, $x, $y) = @_;
1983 2014
1984 ($x, $y) 2015 ($x, $y)
1985} 2016}
1986 2017
… …
1994sub add { 2025sub add {
1995 my ($self, $widget) = @_; 2026 my ($self, $widget) = @_;
1996 2027
1997 $self->SUPER::add ($widget); 2028 $self->SUPER::add ($widget);
1998 2029
1999 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2030 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2000} 2031}
2001 2032
2002sub on_refresh { 2033sub on_refresh {
2003 my ($self, $id, $cb) = @_; 2034 my ($self, $id, $cb) = @_;
2004 2035
… …
2027 2058
2028############################################################################# 2059#############################################################################
2029 2060
2030package CFClient::UI; 2061package CFClient::UI;
2031 2062
2032$TOPLEVEL = new CFClient::UI::Toplevel; 2063$ROOT = new CFClient::UI::Root;
2033 2064
20341 20651
2035 2066

Diff Legend

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