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.115 by root, Sat Apr 15 19:35:20 2006 UTC vs.
Revision 1.120 by elmex, Sun Apr 16 17:43:17 2006 UTC

… …
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
… …
176 176
177 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus}; 178 return unless $self->{can_focus};
179 179
180 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
181
182 $self->emit (focus_in => $focus);
183
181 $focus->update if $focus; 184 $focus->update if $focus;
182 $FOCUS->update; 185 $FOCUS->update;
183} 186}
184 187
185sub focus_out { 188sub focus_out {
186 my ($self) = @_; 189 my ($self) = @_;
187 190
188 return unless $FOCUS == $self; 191 return unless $FOCUS == $self;
189 192
190 my $focus = $FOCUS; undef $FOCUS; 193 my $focus = $FOCUS; undef $FOCUS;
194
195 $self->emit (focus_out => $focus);
196
191 $focus->update if $focus; #? 197 $focus->update if $focus; #?
192} 198}
193 199
194sub mouse_motion { } 200sub mouse_motion { }
195sub button_up { } 201sub button_up { }
… …
565 # TODO: user_x, user_y, overwrite moveto? 571 # TODO: user_x, user_y, overwrite moveto?
566 572
567 $class->SUPER::new ( 573 $class->SUPER::new (
568 bg => [1, 1, 1, 1], 574 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1], 575 border_bg => [1, 1, 1, 1],
570 border => $::FONTSIZE * 0.8, 576 border => int $::FONTSIZE * 0.8,
571 @_ 577 @_
572 ) 578 )
573} 579}
574 580
575sub size_request { 581sub size_request {
… …
950 my $self = $class->SUPER::new ( 956 my $self = $class->SUPER::new (
951 fg => [1, 1, 1], 957 fg => [1, 1, 1],
952 fontsize => $::FONTSIZE, 958 fontsize => $::FONTSIZE,
953 text => "", 959 text => "",
954 align => -1, 960 align => -1,
961 valign => -1,
955 padding => 2, 962 padding => 2,
956 layout => new CFClient::Layout, 963 layout => new CFClient::Layout,
957 %arg 964 %arg
958 ); 965 );
959 966
… …
1036 my $x = 1043 my $x =
1037 $self->{align} < 0 ? $self->{padding} 1044 $self->{align} < 0 ? $self->{padding}
1038 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1045 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1039 : ($self->{w} - $tex->{w}) * 0.5; 1046 : ($self->{w} - $tex->{w}) * 0.5;
1040 1047
1041 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1048 my $y =
1049 $self->{valign} < 0 ? $self->{padding}
1050 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1051 : ($self->{h} - $tex->{h}) * 0.5;
1052
1053 $tex->draw_quad (int $x, int $y);
1042 1054
1043 glDisable GL_TEXTURE_2D; 1055 glDisable GL_TEXTURE_2D;
1044 glDisable GL_BLEND; 1056 glDisable GL_BLEND;
1045} 1057}
1046 1058
… …
1061 bg => [0, 0, 0, 0.2], 1073 bg => [0, 0, 0, 0.2],
1062 active_bg => [1, 1, 1, 0.5], 1074 active_bg => [1, 1, 1, 0.5],
1063 active_fg => [0, 0, 0], 1075 active_fg => [0, 0, 0],
1064 can_hover => 1, 1076 can_hover => 1,
1065 can_focus => 1, 1077 can_focus => 1,
1078 valign => 0,
1066 @_ 1079 @_
1067 ) 1080 )
1068} 1081}
1069 1082
1070sub _set_text { 1083sub _set_text {
… …
1269 1282
1270sub _draw { 1283sub _draw {
1271 my ($self) = @_; 1284 my ($self) = @_;
1272 1285
1273 local $self->{fg} = $self->{fg}; 1286 local $self->{fg} = $self->{fg};
1274 my $tex = $tex[0];
1275
1276 glEnable GL_BLEND;
1277 glEnable GL_TEXTURE_2D;
1278 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1279 1287
1280 if ($GRAB == $self) { 1288 if ($GRAB == $self) {
1281 $self->{fg} = $self->{active_fg}; 1289 $self->{fg} = $self->{active_fg};
1282 } 1290 }
1283 1291
1284 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1292 glEnable GL_BLEND;
1293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1294 glEnable GL_TEXTURE_2D;
1285 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1296 glColor 0, 0, 0, 1;
1286 1297
1287 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1298 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1288 1299
1289 glDisable GL_TEXTURE_2D; 1300 glDisable GL_TEXTURE_2D;
1290 glDisable GL_BLEND; 1301 glDisable GL_BLEND;
1291 1302
1292 $self->SUPER::_draw; 1303 $self->SUPER::_draw;
… …
1774 0.1, 0.1, 0.1, 1785 0.1, 0.1, 0.1,
1775 ; 1786 ;
1776 glEnable GL_CONVOLUTION_2D; 1787 glEnable GL_CONVOLUTION_2D;
1777 } 1788 }
1778 1789
1779 my $tex = new CFClient::Texture 1790 $self->{fow_texture} = new CFClient::Texture
1780 w => $w, 1791 w => $w,
1781 h => $h, 1792 h => $h,
1782 data => $data, 1793 data => $data,
1783 internalformat => GL_ALPHA, 1794 internalformat => GL_ALPHA,
1784 format => GL_ALPHA; 1795 format => GL_ALPHA;
… …
1789 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1800 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1790 glEnable GL_TEXTURE_2D; 1801 glEnable GL_TEXTURE_2D;
1791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1802 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1792 1803
1793 glColor +($::CFG->{fow_intensity}) x 3, 1; 1804 glColor +($::CFG->{fow_intensity}) x 3, 1;
1794 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1805 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1795 1806
1796 glDisable GL_TEXTURE_2D; 1807 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND; 1808 glDisable GL_BLEND;
1798 } 1809 }
1799 1810
… …
1805 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 1818 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 1820
1821 $self->{mapmap_texture} =
1810 CFClient::Texture->new ( 1822 new CFClient::Texture
1811 w => $w, 1823 w => $w,
1812 h => $h, 1824 h => $h,
1813 data => $::MAP->mapmap ($w, $h), 1825 data => $::MAP->mapmap ($w, $h),
1814 type => GL_UNSIGNED_INT_8_8_8_8_REV 1826 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1815 )->draw_quad (100, 100); 1827
1828 $self->{mapmap_texture}->draw_quad (100, 100);
1816 1829
1817 glDisable GL_TEXTURE_2D; 1830 glDisable GL_TEXTURE_2D;
1818 glDisable GL_BLEND; 1831 glDisable GL_BLEND;
1819 } 1832 }
1820 # HACK END 1833 # HACK END
… …
2016sub add { 2029sub add {
2017 my ($self, $widget) = @_; 2030 my ($self, $widget) = @_;
2018 2031
2019 $self->SUPER::add ($widget); 2032 $self->SUPER::add ($widget);
2020 2033
2021 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2034 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2022} 2035}
2023 2036
2024sub on_refresh { 2037sub on_refresh {
2025 my ($self, $id, $cb) = @_; 2038 my ($self, $id, $cb) = @_;
2026 2039

Diff Legend

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