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.229 by root, Wed May 24 21:49:58 2006 UTC

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

Diff Legend

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