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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.230 by root, Wed May 24 21:59:54 2006 UTC

… …
136 $rem += $_ - $i; 136 $rem += $_ - $i;
137 $_ = $i; 137 $_ = $i;
138 } 138 }
139} 139}
140 140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149sub reconfigure_widgets {
150 # make a copy, otherwise C<for> complains about freed values.
151 my @widgets = values %WIDGET;
152
153 $_->reconfigure
154 for @widgets;
155}
156
141# call when resolution changes etc. 157# call when resolution changes etc.
142sub rescale_widgets { 158sub rescale_widgets {
143 my ($sx, $sy) = @_; 159 my ($sx, $sy) = @_;
144 160
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 161 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 162 if ($widget->{is_toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 } 171 }
159
160 $widget->reconfigure;
161 } 172 }
173
174 reconfigure_widgets;
162} 175}
163 176
164############################################################################# 177#############################################################################
165 178
166package CFClient::UI::Base; 179package CFClient::UI::Base;
… …
198 %$self = (); 211 %$self = ();
199} 212}
200 213
201sub show { 214sub show {
202 my ($self) = @_; 215 my ($self) = @_;
203
204 return if $self->{parent}; 216 return if $self->{parent};
205 217
206 $CFClient::UI::ROOT->add ($self); 218 $CFClient::UI::ROOT->add ($self);
219}
220
221sub show_centered {
222 my ($self) = @_;
223 return if $self->{parent};
224
225 $self->show;
226
227 $CFClient::UI::ROOT->on_post_alloc (
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
207} 232}
208 233
209sub hide { 234sub hide {
210 my ($self) = @_; 235 my ($self) = @_;
211 236
… …
419 Scalar::Util::weaken ($self->{parent} = $parent); 444 Scalar::Util::weaken ($self->{parent} = $parent);
420 445
421 # TODO: req_w _does_change after ->reconfigure 446 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 447 $self->check_size
423 unless exists $self->{req_w}; 448 unless exists $self->{req_w};
449
450 $self->show;
424} 451}
425 452
426sub check_size { 453sub check_size {
427 my ($self, $forced) = @_; 454 my ($self, $forced) = @_;
428 455
… …
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 719 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 720 glClear GL_COLOR_BUFFER_BIT;
694 721
695 $self->_render; 722 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 723 };
704} 724}
705 725
706sub _draw { 726sub _draw {
707 my ($self) = @_; 727 my ($self) = @_;
… …
711 my $tex = $self->{texture} 731 my $tex = $self->{texture}
712 or return; 732 or return;
713 733
714 glEnable GL_TEXTURE_2D; 734 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 736 glColor 1, 1, 1, 1;
717 737
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 739
720 glDisable GL_TEXTURE_2D; 740 glDisable GL_TEXTURE_2D;
721} 741}
… …
728 748
729sub size_request { 749sub size_request {
730 my ($self) = @_; 750 my ($self) = @_;
731 751
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 753
735 @$self{qw(child_w child_h)} 754 @$self{qw(child_w child_h)}
736} 755}
737 756
738sub size_allocate { 757sub size_allocate {
739 my ($self, $w, $h) = @_; 758 my ($self, $w, $h) = @_;
740 759
760 my ($cw, $ch) = @$self{qw(child_w child_h)};
761# $w = $self->{w};
762 $self->child->configure (0, 0, $cw, $ch);
741 $self->update; 763 $self->update;
742} 764}
743 765
744sub set_offset { 766sub set_offset {
745 my ($self, $x, $y) = @_; 767 my ($self, $x, $y) = @_;
… …
799 821
800 my $slider = new CFClient::UI::Slider 822 my $slider = new CFClient::UI::Slider
801 vertical => 1, 823 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 824 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 825 connect_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 826 $self->{vp}->set_offset (0, $_[1]);
805 }, 827 },
806 ; 828 ;
807 829
808 $self = $class->SUPER::new ( 830 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 831 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 832 slider => $slider,
811 @_, 833 @_,
812 ); 834 );
813 835
814 $self->{vp}->add ($self->{scrolled}); 836 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp}); 837 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 838 $self->add ($self->{slider});
817 839
818 $self 840 $self
841}
842
843sub size_allocate {
844 my ($self, $w, $h) = @_;
845
846 $self->SUPER::size_allocate ($w, $h);
847
848 my $child = $self->{vp}->child;
849 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
819} 850}
820 851
821#TODO# update range on size_allocate depending on child 852#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 853# update viewport offset on scroll
823 854
… …
877 my $class = shift; 908 my $class = shift;
878 909
879 # TODO: user_x, user_y, overwrite moveto? 910 # TODO: user_x, user_y, overwrite moveto?
880 911
881 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 913 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 914 border_bg => [1, 1, 1, 1],
884 border => 0.6, 915 border => 0.6,
885 toplevel => 1, 916 is_toplevel => 1,
886 can_events => 1, 917 can_events => 1,
887 @_ 918 @_
888 ); 919 );
889 920
890 $self->{title} &&= new CFClient::UI::Label 921 $self->{title} &&= new CFClient::UI::Label
891 align => 0, 922 align => 0,
… …
1473 active_fg => [0, 0, 0], 1504 active_fg => [0, 0, 0],
1474 can_hover => 1, 1505 can_hover => 1,
1475 can_focus => 1, 1506 can_focus => 1,
1476 valign => 0, 1507 valign => 0,
1477 can_events => 1, 1508 can_events => 1,
1509 #text => ...
1478 @_ 1510 @_
1479 ) 1511 )
1480} 1512}
1481 1513
1482sub _set_text { 1514sub _set_text {
… …
2052 my $self = $class->SUPER::new ( 2084 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2086 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2089 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2090 req_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2091 req_h => $::WIDTH / 80,
2060 vertical => 0, 2092 vertical => 0,
2061 can_hover => 1, 2093 can_hover => 1,
2062 inner_pad => .05, 2094 inner_pad => 0.02,
2063 @_ 2095 @_
2064 ); 2096 );
2065 2097
2066 $self->set_value ($self->{range}[0]); 2098 $self->set_value ($self->{range}[0]);
2067 $self->update; 2099 $self->update;
2068 2100
2069 $self 2101 $self
2070} 2102}
2071 2103
2104sub set_range {
2105 my ($self, $range) = @_;
2106
2107 $self->{range} = $range;
2108
2109 $self->update;
2110}
2111
2072sub set_value { 2112sub set_value {
2073 my ($self, $value) = @_; 2113 my ($self, $value) = @_;
2074 2114
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2115 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2116
2077 $hi = $lo + 1 if $hi <= $lo; 2117 $hi = $lo + 1 if $hi <= $lo;
2078 2118
2119 $page = $hi - $lo if $page > $hi - $lo;
2120
2079 $value = $lo if $value < $lo; 2121 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2122 $value = $hi - $page if $value > $hi - $page;
2081 2123
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2124 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2125 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086 2126
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2128
2089 if ($value != $old_value) { 2129 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2130 $self->emit (changed => $value);
… …
2103 2143
2104sub button_down { 2144sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
2106 2146
2107 $self->SUPER::button_down ($ev, $x, $y); 2147 $self->SUPER::button_down ($ev, $x, $y);
2148
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150
2108 $self->mouse_motion ($ev, $x, $y); 2151 $self->mouse_motion ($ev, $x, $y);
2109} 2152}
2110 2153
2111sub mouse_motion { 2154sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2155 my ($self, $ev, $x, $y) = @_;
… …
2114 if ($GRAB == $self) { 2157 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2159
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2160 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2161
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2163
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122 } 2165 }
2123} 2166}
2124 2167
2125sub update { 2168sub update {
2126 my ($self) = @_; 2169 my ($self) = @_;
2127 2170
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2172 $self->set_value ($self->{range}[0]);
2130 2173
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2174 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100;
2132 2176
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2177 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2178
2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2179 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2180 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136 2181
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2182 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2183 $value = $value * $self->{scale} + $self->{offset};
2139 2184
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2185 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2186 $self->{knob_w} = $knob_w;
2147 }); 2187 });
2148 2188
2149 $self->SUPER::update; 2189 $self->SUPER::update;
2150} 2190}
2151 2191
… …
2175 # draw handle 2215 # draw handle
2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2216 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177 2217
2178 glDisable GL_TEXTURE_2D; 2218 glDisable GL_TEXTURE_2D;
2179} 2219}
2220
2221#############################################################################
2222
2223package CFClient::UI::ValSlider;
2224
2225our @ISA = CFClient::UI::HBox::;
2226
2227sub new {
2228 my ($class, %arg) = @_;
2229
2230 my $range = delete $arg{range};
2231
2232 my $self = $class->SUPER::new (
2233 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2234 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2235 to_value => sub { shift },
2236 from_value => sub { shift },
2237 %arg,
2238 );
2239
2240 $self->{slider}->connect (changed => sub {
2241 my ($self, $value) = @_;
2242 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2243 $self->{parent}->emit (changed => $value);
2244 });
2245
2246# $self->{entry}->connect (changed => sub {
2247# my ($self, $value) = @_;
2248# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2249# $self->{parent}->emit (changed => $value);
2250# });
2251
2252 $self->add ($self->{slider}, $self->{entry});
2253
2254 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2255
2256 $self
2257}
2258
2259sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) }
2180 2261
2181############################################################################# 2262#############################################################################
2182 2263
2183package CFClient::UI::TextView; 2264package CFClient::UI::TextView;
2184 2265
… …
2214 2295
2215 $self->{fontsize} = $fontsize; 2296 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2297 $self->reflow;
2217} 2298}
2218 2299
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2300sub size_allocate {
2239 my ($self, $w, $h) = @_; 2301 my ($self, $w, $h) = @_;
2240 2302
2241 $self->SUPER::size_allocate ($w, $h); 2303 $self->SUPER::size_allocate ($w, $h);
2242 2304
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2307 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2308
2247 $self->reflow; 2309 $self->reflow;
2248} 2310}
2249 2311
2312sub text_size {
2313 my ($self, $text, $indent) = @_;
2314
2315 my $layout = $self->{layout};
2316
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent);
2319 $layout->set_markup ($text);
2320
2321 $layout->size
2322}
2323
2324sub reflow {
2325 my ($self) = @_;
2326
2327 $self->{need_reflow}++;
2328 $self->update;
2329}
2330
2331sub set_offset {
2332 my ($self, $offset) = @_;
2333
2334 # todo: base offset on lines or so, not on pixels
2335 $self->{children}[1]->set_value ($offset);
2336}
2337
2338sub clear {
2339 my ($self) = @_;
2340
2341 $self->{par} = [];
2342 $self->{height} = 0;
2343 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2344}
2345
2250sub add_paragraph { 2346sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2347 my ($self, $color, $text, $indent) = @_;
2252 2348
2253 #TODO: intelligently "reformat" paragraph 2349 for my $line (split /\n/, $text) {
2254 2350 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2351 $self->{height} += $h;
2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2353 }
2258 2354
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2355 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2356}
2264 2357
2265sub update { 2358sub update {
2266 my ($self) = @_; 2359 my ($self) = @_;
2267 2360
… …
2270 return unless $self->{h} > 0; 2363 return unless $self->{h} > 0;
2271 2364
2272 delete $self->{texture}; 2365 delete $self->{texture};
2273 2366
2274 $ROOT->on_post_alloc ($self, sub { 2367 $ROOT->on_post_alloc ($self, sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369
2275 if (delete $self->{need_reflow}) { 2370 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2371 my $height = 0;
2277 2372
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2279 for @{$self->{par}}; 2377 for (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2379 $layout->set_width ($W - $_->[3]);
2380 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3];
2383 $_->[1] = $h;
2384 }
2385
2386 $height += $_->[1];
2387 }
2280 2388
2281 $self->{height} = $height; 2389 $self->{height} = $height;
2282 2390
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2392
2285 delete $self->{texture}; 2393 delete $self->{texture};
2286 } 2394 }
2287 2395
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2397 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2398 glClear GL_COLOR_BUFFER_BIT;
2291 2399
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2400 my $top = int $self->{children}[1]{range}[0];
2296 2401
2297 my $y0 = $top; 2402 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2403 my $y1 = $top + $H;
2299 2404
2300 my $y = 0; 2405 my $y = 0;
2301 2406
2302 my $layout = $self->{layout}; 2407 my $layout = $self->{layout};
2303 2408
2304 $layout->set_font ($self->{font}) if $self->{font}; 2409 $layout->set_font ($self->{font}) if $self->{font};
2305 2410
2411 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off
2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2414
2306 for my $par (@{$self->{par}}) { 2415 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2416 my $h = $par->[1];
2308 2417
2309 if ($y0 < $y + $h && $y < $y1) { 2418 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2419 $layout->set_foreground (@{ $par->[2] });
2420 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2421 $layout->set_markup ($par->[4]);
2312 2422
2313 my ($W, $H) = $layout->size; 2423 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2424
2425 glRasterPos $par->[3], $y - $y0;
2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315 } 2427 }
2316 2428
2317 $y += $h; 2429 $y += $h;
2318 } 2430 }
2319 2431
2320 glDisable GL_TEXTURE_2D; 2432 glDisable GL_BLEND;
2321 }; 2433 };
2322 }); 2434 });
2323} 2435}
2324 2436
2325sub _draw { 2437sub _draw {
2326 my ($self) = @_; 2438 my ($self) = @_;
2327 2439
2328 glEnable GL_TEXTURE_2D; 2440 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2442 glColor 1, 1, 1, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2333 2445
2334 $self->{children}[1]->draw; 2446 $self->{children}[1]->draw;
2335 2447
2336} 2448}
… …
2496use CFClient::OpenGL; 2608use CFClient::OpenGL;
2497 2609
2498sub new { 2610sub new {
2499 my $class = shift; 2611 my $class = shift;
2500 2612
2501 $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2502 aspect => 1, 2614 aspect => 1,
2503 @_, 2615 @_,
2504 ) 2616 );
2617
2618 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self);
2620
2621 $self->{timer} = Event->timer (
2622 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2623 hard => 1,
2624 interval => $self->{animspeed},
2625 cb => sub {
2626 ++$widget->{frame};
2627 $widget->update;
2628 },
2629 );
2630 }
2631
2632 $self
2505} 2633}
2506 2634
2507sub size_request { 2635sub size_request {
2508 (32, 8) 2636 (32, 8)
2509} 2637}
2510 2638
2639sub update {
2640 my ($self) = @_;
2641
2642 return unless $self->{visible};
2643
2644 $self->SUPER::update;
2645}
2646
2511sub _draw { 2647sub _draw {
2512 my ($self) = @_; 2648 my ($self) = @_;
2513 2649
2514 return unless $::CONN;#d# manage and cache textures differently 2650 return unless $::CONN;
2651
2652 my $face;
2653
2654 if ($self->{frame}) {
2655 my $anim = $::CONN->{anim}[$self->{anim}];
2656
2657 $face = $anim->[ $self->{frame} % @$anim ]
2658 if $anim && @$anim;
2659 }
2660
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2662
2517 # TODO animation
2518 if ($tex) { 2663 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2664 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2666 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2668 glDisable GL_TEXTURE_2D;
2524 } 2669 }
2525} 2670}
2526 2671
2672sub DESTROY {
2673 my ($self) = @_;
2674
2675 $self->{timer}->cancel
2676 if $self->{timer};
2677
2678 $self->SUPER::DESTROY;
2679}
2680
2527############################################################################# 2681#############################################################################
2528 2682
2529package CFClient::UI::InventoryItem; 2683package CFClient::UI::InventoryItem;
2530 2684
2531our @ISA = CFClient::UI::HBox::; 2685our @ISA = CFClient::UI::HBox::;
… …
2534 my ($item) = @_; 2688 my ($item) = @_;
2535 2689
2536 my $desc = 2690 my $desc =
2537 $item->{nrof} < 2 2691 $item->{nrof} < 2
2538 ? $item->{name} 2692 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}"; 2693 : "$item->{nrof} × $item->{name_pl}";
2540 2694
2541 $item->{flags} & Crossfire::Protocol::F_OPEN 2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)"; 2696 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED 2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)"; 2698 and $desc .= " (applied)";
… …
2564 my $item = delete $args{item}; 2718 my $item = delete $args{item};
2565 2719
2566 my $desc = _item_to_desc ($item); 2720 my $desc = _item_to_desc ($item);
2567 2721
2568 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2569 can_hover => 1, 2723 can_hover => 1,
2570 can_events => 1, 2724 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc) 2725 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub { 2727 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2575 2729
2576 # todo: maybe put examine on 1? but should just be a tooltip :( 2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) { 2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag}; 2732 my $targ = $::CONN->{player}{tag};
2579 2733
2580 if ($item->{container} == $::CONN->{player}{tag}) { 2734 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT; 2735 $targ = $main::OPENCONT;
2582 } 2736 }
2583 2737
2584 $::CONN->send ("move $targ $item->{tag} 0"); 2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2585 } elsif ($ev->{button} == 2) { 2741 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}"); 2742 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) { 2743 } elsif ($ev->{button} == 3) {
2588 my @menu_items = ( 2744 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [ 2756 )
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ], 2757 ),
2597 ); 2758 );
2598 2759
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 } 2761 }
2601 2762
… …
2637 2798
2638sub new { 2799sub new {
2639 my $class = shift; 2800 my $class = shift;
2640 2801
2641 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox), 2803 scrolled => (new CFClient::UI::Table),
2643 @_, 2804 @_,
2644 ); 2805 );
2645 2806
2646 $self 2807 $self
2647} 2808}
… …
2658 } @$items; 2819 } @$items;
2659 2820
2660 $self->{real_items} = \@items; 2821 $self->{real_items} = \@items;
2661 2822
2662 for my $item (@items) { 2823 for my $item (@items) {
2824 $item->{item} = $item;
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item (); 2826 $item->update_item ();
2665 } 2827 }
2666 2828
2829 my $i = 0;
2830 for (@items) {
2667 $self->{scrolled}->add (@items); 2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2668 2835
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670} 2837}
2671 2838
2672sub size_request { 2839sub size_request {
… …
2891} 3058}
2892 3059
2893sub size_allocate { 3060sub size_allocate {
2894 my ($self, $w, $h) = @_; 3061 my ($self, $w, $h) = @_;
2895 3062
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902 for my $child ($self->children) { 3063 for my $child ($self->children) {
2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904 3065
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906 if exists $child->{req_x}; 3067 if exists $child->{req_x};
… …
2935} 3096}
2936 3097
2937sub add { 3098sub add {
2938 my ($self, @children) = @_; 3099 my ($self, @children) = @_;
2939 3100
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
2940 for my $child (@children) { 3107 for my $child (@children) {
2941 $child->{toplevel} = 1; 3108 $child->{is_toplevel} = 1;
2942 3109
2943 # integerise window positions 3110 # integerise window positions
2944 $child->{x} = int $child->{x}; 3111 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y}; 3112 $child->{y} = int $child->{y};
2946 } 3113 }
2947 3114
2948 $self->SUPER::add (@children); 3115 $self->SUPER::add (@children);
3116}
3117
3118sub remove {
3119 my ($self, @children) = @_;
3120
3121 $self->SUPER::remove (@children);
3122
3123 while (@children) {
3124 my $w = pop @children;
3125 push @children, $w->children;
3126 delete $w->{visible};
3127 }
2949} 3128}
2950 3129
2951sub on_refresh { 3130sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3131 my ($self, $id, $cb) = @_;
2953 3132
… …
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3024 3203
3025 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3205 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3208 glLoadIdentity;
3030 3209
3031 $self->_draw; 3210 $self->_draw;
3032} 3211}

Diff Legend

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