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.228 by root, Wed May 24 03:52:54 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) = @_;
… …
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
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});
… …
1473 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1474 can_hover => 1, 1491 can_hover => 1,
1475 can_focus => 1, 1492 can_focus => 1,
1476 valign => 0, 1493 valign => 0,
1477 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1478 @_ 1496 @_
1479 ) 1497 )
1480} 1498}
1481 1499
1482sub _set_text { 1500sub _set_text {
… …
2052 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2073 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2074 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2060 vertical => 0, 2078 vertical => 0,
2061 can_hover => 1, 2079 can_hover => 1,
2062 inner_pad => .05, 2080 inner_pad => 0.02,
2063 @_ 2081 @_
2064 ); 2082 );
2065 2083
2066 $self->set_value ($self->{range}[0]); 2084 $self->set_value ($self->{range}[0]);
2067 $self->update; 2085 $self->update;
2068 2086
2069 $self 2087 $self
2070} 2088}
2071 2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2072sub set_value { 2098sub set_value {
2073 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2074 2100
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2102
2077 $hi = $lo + 1 if $hi <= $lo; 2103 $hi = $lo + 1 if $hi <= $lo;
2078 2104
2105 $page = $hi - $lo if $page > $hi - $lo;
2106
2079 $value = $lo if $value < $lo; 2107 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2108 $value = $hi - $page if $value > $hi - $page;
2081 2109
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2110 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2111 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086 2112
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2114
2089 if ($value != $old_value) { 2115 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2116 $self->emit (changed => $value);
… …
2103 2129
2104sub button_down { 2130sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
2106 2132
2107 $self->SUPER::button_down ($ev, $x, $y); 2133 $self->SUPER::button_down ($ev, $x, $y);
2134
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136
2108 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
2109} 2138}
2110 2139
2111sub mouse_motion { 2140sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
… …
2114 if ($GRAB == $self) { 2143 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2145
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2146 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2147
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2149
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122 } 2151 }
2123} 2152}
2124 2153
2125sub update { 2154sub update {
2126 my ($self) = @_; 2155 my ($self) = @_;
2127 2156
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2158 $self->set_value ($self->{range}[0]);
2130 2159
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
2132 2162
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2164
2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2165 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2166 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136 2167
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2168 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2169 $value = $value * $self->{scale} + $self->{offset};
2139 2170
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; 2171 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2172 $self->{knob_w} = $knob_w;
2147 }); 2173 });
2148 2174
2149 $self->SUPER::update; 2175 $self->SUPER::update;
2150} 2176}
2151 2177
… …
2175 # draw handle 2201 # draw handle
2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177 2203
2178 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2179} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2180 2247
2181############################################################################# 2248#############################################################################
2182 2249
2183package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2184 2251
… …
2214 2281
2215 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2283 $self->reflow;
2217} 2284}
2218 2285
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 { 2286sub size_allocate {
2239 my ($self, $w, $h) = @_; 2287 my ($self, $w, $h) = @_;
2240 2288
2241 $self->SUPER::size_allocate ($w, $h); 2289 $self->SUPER::size_allocate ($w, $h);
2242 2290
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2294
2247 $self->reflow; 2295 $self->reflow;
2248} 2296}
2249 2297
2298sub text_size {
2299 my ($self, $text, $indent) = @_;
2300
2301 my $layout = $self->{layout};
2302
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text);
2306
2307 $layout->size
2308}
2309
2310sub reflow {
2311 my ($self) = @_;
2312
2313 $self->{need_reflow}++;
2314 $self->update;
2315}
2316
2317sub set_offset {
2318 my ($self, $offset) = @_;
2319
2320 # todo: base offset on lines or so, not on pixels
2321 $self->{children}[1]->set_value ($offset);
2322}
2323
2324sub clear {
2325 my ($self) = @_;
2326
2327 $self->{par} = [];
2328 $self->{height} = 0;
2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2330}
2331
2250sub add_paragraph { 2332sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2333 my ($self, $color, $text, $indent) = @_;
2252 2334
2253 #TODO: intelligently "reformat" paragraph 2335 for my $line (split /\n/, $text) {
2254 2336 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2337 $self->{height} += $h;
2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2339 }
2258 2340
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2342}
2264 2343
2265sub update { 2344sub update {
2266 my ($self) = @_; 2345 my ($self) = @_;
2267 2346
… …
2270 return unless $self->{h} > 0; 2349 return unless $self->{h} > 0;
2271 2350
2272 delete $self->{texture}; 2351 delete $self->{texture};
2273 2352
2274 $ROOT->on_post_alloc ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355
2275 if (delete $self->{need_reflow}) { 2356 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2357 my $height = 0;
2277 2358
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2359 my $layout = $self->{layout};
2360
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362
2279 for @{$self->{par}}; 2363 for (@{$self->{par}}) {
2364 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2365 $layout->set_width ($W - $_->[3]);
2366 $layout->set_markup ($_->[4]);
2367 my ($w, $h) = $layout->size;
2368 $_->[0] = $w + $_->[3];
2369 $_->[1] = $h;
2370 }
2371
2372 $height += $_->[1];
2373 }
2280 2374
2281 $self->{height} = $height; 2375 $self->{height} = $height;
2282 2376
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2378
2285 delete $self->{texture}; 2379 delete $self->{texture};
2286 } 2380 }
2287 2381
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2383 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2384 glClear GL_COLOR_BUFFER_BIT;
2291 2385
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]; 2386 my $top = int $self->{children}[1]{range}[0];
2296 2387
2297 my $y0 = $top; 2388 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2389 my $y1 = $top + $H;
2299 2390
2300 my $y = 0; 2391 my $y = 0;
2301 2392
2302 my $layout = $self->{layout}; 2393 my $layout = $self->{layout};
2303 2394
2304 $layout->set_font ($self->{font}) if $self->{font}; 2395 $layout->set_font ($self->{font}) if $self->{font};
2305 2396
2397 glEnable GL_BLEND;
2398 #TODO# not correct in windows where rgba is forced off
2399 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2400
2306 for my $par (@{$self->{par}}) { 2401 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2402 my $h = $par->[1];
2308 2403
2309 if ($y0 < $y + $h && $y < $y1) { 2404 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2405 $layout->set_foreground (@{ $par->[2] });
2406 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2407 $layout->set_markup ($par->[4]);
2312 2408
2313 my ($W, $H) = $layout->size; 2409 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2410
2411 glRasterPos $par->[3], $y - $y0;
2412 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315 } 2413 }
2316 2414
2317 $y += $h; 2415 $y += $h;
2318 } 2416 }
2319 2417
2320 glDisable GL_TEXTURE_2D; 2418 glDisable GL_BLEND;
2321 }; 2419 };
2322 }); 2420 });
2323} 2421}
2324 2422
2325sub _draw { 2423sub _draw {
2326 my ($self) = @_; 2424 my ($self) = @_;
2327 2425
2328 glEnable GL_TEXTURE_2D; 2426 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2428 glColor 1, 1, 1, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2429 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2430 glDisable GL_TEXTURE_2D;
2333 2431
2334 $self->{children}[1]->draw; 2432 $self->{children}[1]->draw;
2335 2433
2336} 2434}
… …
2496use CFClient::OpenGL; 2594use CFClient::OpenGL;
2497 2595
2498sub new { 2596sub new {
2499 my $class = shift; 2597 my $class = shift;
2500 2598
2501 $class->SUPER::new ( 2599 my $self = $class->SUPER::new (
2502 aspect => 1, 2600 aspect => 1,
2503 @_, 2601 @_,
2504 ) 2602 );
2603
2604 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self);
2606
2607 $self->{timer} = Event->timer (
2608 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2609 hard => 1,
2610 interval => $self->{animspeed},
2611 cb => sub {
2612 ++$widget->{frame};
2613 $widget->update;
2614 },
2615 );
2616 }
2617
2618 $self
2505} 2619}
2506 2620
2507sub size_request { 2621sub size_request {
2508 (32, 8) 2622 (32, 8)
2509} 2623}
2510 2624
2625sub update {
2626 my ($self) = @_;
2627
2628 return unless $self->{visible};
2629
2630 $self->SUPER::update;
2631}
2632
2511sub _draw { 2633sub _draw {
2512 my ($self) = @_; 2634 my ($self) = @_;
2513 2635
2514 return unless $::CONN;#d# manage and cache textures differently 2636 return unless $::CONN;
2637
2638 my $face;
2639
2640 if ($self->{frame}) {
2641 my $anim = $::CONN->{anim}[$self->{anim}];
2642
2643 $face = $anim->[ $self->{frame} % @$anim ]
2644 if $anim && @$anim;
2645 }
2646
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2648
2517 # TODO animation
2518 if ($tex) { 2649 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2650 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2652 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2654 glDisable GL_TEXTURE_2D;
2524 } 2655 }
2525} 2656}
2526 2657
2658sub DESTROY {
2659 my ($self) = @_;
2660
2661 $self->{timer}->cancel
2662 if $self->{timer};
2663
2664 $self->SUPER::DESTROY;
2665}
2666
2527############################################################################# 2667#############################################################################
2528 2668
2529package CFClient::UI::InventoryItem; 2669package CFClient::UI::InventoryItem;
2530 2670
2531our @ISA = CFClient::UI::HBox::; 2671our @ISA = CFClient::UI::HBox::;
… …
2534 my ($item) = @_; 2674 my ($item) = @_;
2535 2675
2536 my $desc = 2676 my $desc =
2537 $item->{nrof} < 2 2677 $item->{nrof} < 2
2538 ? $item->{name} 2678 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}"; 2679 : "$item->{nrof} × $item->{name_pl}";
2540 2680
2541 $item->{flags} & Crossfire::Protocol::F_OPEN 2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)"; 2682 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED 2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)"; 2684 and $desc .= " (applied)";
… …
2564 my $item = delete $args{item}; 2704 my $item = delete $args{item};
2565 2705
2566 my $desc = _item_to_desc ($item); 2706 my $desc = _item_to_desc ($item);
2567 2707
2568 my $self = $class->SUPER::new ( 2708 my $self = $class->SUPER::new (
2569 can_hover => 1, 2709 can_hover => 1,
2570 can_events => 1, 2710 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc) 2711 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub { 2713 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_; 2714 my ($self, $ev, $x, $y) = @_;
2575 2715
2576 # todo: maybe put examine on 1? but should just be a tooltip :( 2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) { 2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag}; 2718 my $targ = $::CONN->{player}{tag};
2579 2719
2580 if ($item->{container} == $::CONN->{player}{tag}) { 2720 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT; 2721 $targ = $main::OPENCONT;
2582 } 2722 }
2583 2723
2584 $::CONN->send ("move $targ $item->{tag} 0"); 2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2585 } elsif ($ev->{button} == 2) { 2727 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}"); 2728 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) { 2729 } elsif ($ev->{button} == 3) {
2588 my @menu_items = ( 2730 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [ 2742 )
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ], 2743 ),
2597 ); 2744 );
2598 2745
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 } 2747 }
2601 2748
… …
2637 2784
2638sub new { 2785sub new {
2639 my $class = shift; 2786 my $class = shift;
2640 2787
2641 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox), 2789 scrolled => (new CFClient::UI::Table),
2643 @_, 2790 @_,
2644 ); 2791 );
2645 2792
2646 $self 2793 $self
2647} 2794}
… …
2658 } @$items; 2805 } @$items;
2659 2806
2660 $self->{real_items} = \@items; 2807 $self->{real_items} = \@items;
2661 2808
2662 for my $item (@items) { 2809 for my $item (@items) {
2810 $item->{item} = $item;
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item (); 2812 $item->update_item ();
2665 } 2813 }
2666 2814
2815 my $i = 0;
2816 for (@items) {
2667 $self->{scrolled}->add (@items); 2817 $self->{scrolled}->add (0, $i, $_);
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2668 2821
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670} 2823}
2671 2824
2672sub size_request { 2825sub size_request {
… …
2944 $child->{x} = int $child->{x}; 3097 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y}; 3098 $child->{y} = int $child->{y};
2946 } 3099 }
2947 3100
2948 $self->SUPER::add (@children); 3101 $self->SUPER::add (@children);
3102
3103 while (@children) {
3104 my $w = pop @children;
3105 push @children, $w->children;
3106 $w->{visible} = 1;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 }
2949} 3120}
2950 3121
2951sub on_refresh { 3122sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3123 my ($self, $id, $cb) = @_;
2953 3124
… …
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3194 glClear GL_COLOR_BUFFER_BIT;
3024 3195
3025 glMatrixMode GL_PROJECTION; 3196 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3197 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3199 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3200 glLoadIdentity;
3030 3201
3031 $self->_draw; 3202 $self->_draw;
3032} 3203}

Diff Legend

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