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.215 by root, Fri May 19 03:49:48 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
… …
687 709
688sub render_child { 710sub render_child {
689 my ($self) = @_; 711 my ($self) = @_;
690 712
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.5, 0.5, 0.5, 1; 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 }; 718 };
697} 719}
… …
721 743
722sub size_request { 744sub size_request {
723 my ($self) = @_; 745 my ($self) = @_;
724 746
725 @$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)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 748
728 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
729} 750}
730 751
731sub size_allocate { 752sub size_allocate {
732 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
733 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
734 $self->update; 758 $self->update;
735} 759}
736 760
737sub set_offset { 761sub set_offset {
738 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
797 $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}));
798 }, 822 },
799 ; 823 ;
800 824
801 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 827 slider => $slider,
804 @_, 828 @_,
805 ); 829 );
806 830
807 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
1466 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1467 can_hover => 1, 1491 can_hover => 1,
1468 can_focus => 1, 1492 can_focus => 1,
1469 valign => 0, 1493 valign => 0,
1470 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1471 @_ 1496 @_
1472 ) 1497 )
1473} 1498}
1474 1499
1475sub _set_text { 1500sub _set_text {
… …
2045 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2073 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2074 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2053 vertical => 0, 2078 vertical => 0,
2054 can_hover => 1, 2079 can_hover => 1,
2055 inner_pad => .05, 2080 inner_pad => 0.02,
2056 @_ 2081 @_
2057 ); 2082 );
2058 2083
2059 $self->set_value ($self->{range}[0]); 2084 $self->set_value ($self->{range}[0]);
2060 $self->update; 2085 $self->update;
2061 2086
2062 $self 2087 $self
2063} 2088}
2064 2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2065sub set_value { 2098sub set_value {
2066 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2067 2100
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2102
2070 $hi = $lo + 1 if $hi <= $lo; 2103 $hi = $lo + 1 if $hi <= $lo;
2071 2104
2105 $page = $hi - $lo if $page > $hi - $lo;
2106
2072 $value = $lo if $value < $lo; 2107 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2108 $value = $hi - $page if $value > $hi - $page;
2074 2109
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2110 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2111 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079 2112
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2114
2082 if ($value != $old_value) { 2115 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2116 $self->emit (changed => $value);
… …
2096 2129
2097sub button_down { 2130sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
2099 2132
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
2102} 2138}
2103 2139
2104sub mouse_motion { 2140sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2143 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2145
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2146 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2147
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2149
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2151 }
2116} 2152}
2117 2153
2118sub update { 2154sub update {
2119 my ($self) = @_; 2155 my ($self) = @_;
2120 2156
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2158 $self->set_value ($self->{range}[0]);
2123 2159
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
2125 2162
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2164
2128 $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;
2129 2167
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2168 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2169 $value = $value * $self->{scale} + $self->{offset};
2132 2170
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2171 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2172 $self->{knob_w} = $knob_w;
2140 }); 2173 });
2141 2174
2142 $self->SUPER::update; 2175 $self->SUPER::update;
2143} 2176}
2144 2177
… …
2168 # draw handle 2201 # draw handle
2169 $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);
2170 2203
2171 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2172} 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 (@_) }
2173 2247
2174############################################################################# 2248#############################################################################
2175 2249
2176package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2177 2251
… …
2207 2281
2208 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2283 $self->reflow;
2210} 2284}
2211 2285
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2286sub size_allocate {
2232 my ($self, $w, $h) = @_; 2287 my ($self, $w, $h) = @_;
2233 2288
2234 $self->SUPER::size_allocate ($w, $h); 2289 $self->SUPER::size_allocate ($w, $h);
2235 2290
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2294
2240 $self->reflow; 2295 $self->reflow;
2241} 2296}
2242 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
2243sub add_paragraph { 2332sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2333 my ($self, $color, $text, $indent) = @_;
2245 2334
2246 #TODO: intelligently "reformat" paragraph 2335 for my $line (split /\n/, $text) {
2247 2336 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2337 $self->{height} += $h;
2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2339 }
2251 2340
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $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]);
2255 $self->{children}[1]->update;
2256} 2342}
2257 2343
2258sub update { 2344sub update {
2259 my ($self) = @_; 2345 my ($self) = @_;
2260 2346
… …
2263 return unless $self->{h} > 0; 2349 return unless $self->{h} > 0;
2264 2350
2265 delete $self->{texture}; 2351 delete $self->{texture};
2266 2352
2267 $ROOT->on_post_alloc ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355
2268 if (delete $self->{need_reflow}) { 2356 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2357 my $height = 0;
2270 2358
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2359 my $layout = $self->{layout};
2360
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362
2272 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 }
2273 2374
2274 $self->{height} = $height; 2375 $self->{height} = $height;
2275 2376
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2378
2278 delete $self->{texture}; 2379 delete $self->{texture};
2279 } 2380 }
2280 2381
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2383 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2384 glClear GL_COLOR_BUFFER_BIT;
2284 2385
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2386 my $top = int $self->{children}[1]{range}[0];
2289 2387
2290 my $y0 = $top; 2388 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2389 my $y1 = $top + $H;
2292 2390
2293 my $y = 0; 2391 my $y = 0;
2294 2392
2295 my $layout = $self->{layout}; 2393 my $layout = $self->{layout};
2296 2394
2297 $layout->set_font ($self->{font}) if $self->{font}; 2395 $layout->set_font ($self->{font}) if $self->{font};
2298 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
2299 for my $par (@{$self->{par}}) { 2401 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2402 my $h = $par->[1];
2301 2403
2302 if ($y0 < $y + $h && $y < $y1) { 2404 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2405 $layout->set_foreground (@{ $par->[2] });
2406 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2407 $layout->set_markup ($par->[4]);
2305 2408
2306 my ($W, $H) = $layout->size; 2409 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 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;
2308 } 2413 }
2309 2414
2310 $y += $h; 2415 $y += $h;
2311 } 2416 }
2312 2417
2313 glDisable GL_TEXTURE_2D; 2418 glDisable GL_BLEND;
2314 }; 2419 };
2315 }); 2420 });
2316} 2421}
2317 2422
2318sub _draw { 2423sub _draw {
2319 my ($self) = @_; 2424 my ($self) = @_;
2320 2425
2321 glEnable GL_TEXTURE_2D; 2426 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 2428 glColor 1, 1, 1, 1;
2324 $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});
2325 glDisable GL_TEXTURE_2D; 2430 glDisable GL_TEXTURE_2D;
2326 2431
2327 $self->{children}[1]->draw; 2432 $self->{children}[1]->draw;
2328 2433
2329} 2434}
… …
2489use CFClient::OpenGL; 2594use CFClient::OpenGL;
2490 2595
2491sub new { 2596sub new {
2492 my $class = shift; 2597 my $class = shift;
2493 2598
2494 $class->SUPER::new ( 2599 my $self = $class->SUPER::new (
2495 aspect => 1, 2600 aspect => 1,
2496 @_, 2601 @_,
2497 ) 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
2498} 2619}
2499 2620
2500sub size_request { 2621sub size_request {
2501 (32, 8) 2622 (32, 8)
2502} 2623}
2503 2624
2625sub update {
2626 my ($self) = @_;
2627
2628 return unless $self->{visible};
2629
2630 $self->SUPER::update;
2631}
2632
2504sub _draw { 2633sub _draw {
2505 my ($self) = @_; 2634 my ($self) = @_;
2506 2635
2507 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
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2648
2510 # TODO animation
2511 if ($tex) { 2649 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2650 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2652 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2654 glDisable GL_TEXTURE_2D;
2517 } 2655 }
2518} 2656}
2519 2657
2658sub DESTROY {
2659 my ($self) = @_;
2660
2661 $self->{timer}->cancel
2662 if $self->{timer};
2663
2664 $self->SUPER::DESTROY;
2665}
2666
2520############################################################################# 2667#############################################################################
2521 2668
2522package CFClient::UI::InventoryItem; 2669package CFClient::UI::InventoryItem;
2523 2670
2524our @ISA = CFClient::UI::HBox::; 2671our @ISA = CFClient::UI::HBox::;
… …
2527 my ($item) = @_; 2674 my ($item) = @_;
2528 2675
2529 my $desc = 2676 my $desc =
2530 $item->{nrof} < 2 2677 $item->{nrof} < 2
2531 ? $item->{name} 2678 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}"; 2679 : "$item->{nrof} × $item->{name_pl}";
2533 2680
2534 $item->{flags} & Crossfire::Protocol::F_OPEN 2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)"; 2682 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED 2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)"; 2684 and $desc .= " (applied)";
… …
2557 my $item = delete $args{item}; 2704 my $item = delete $args{item};
2558 2705
2559 my $desc = _item_to_desc ($item); 2706 my $desc = _item_to_desc ($item);
2560 2707
2561 my $self = $class->SUPER::new ( 2708 my $self = $class->SUPER::new (
2562 can_hover => 1, 2709 can_hover => 1,
2563 can_events => 1, 2710 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc) 2711 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\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>"),
2566 connect_button_down => sub { 2713 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_; 2714 my ($self, $ev, $x, $y) = @_;
2568 2715
2569 # 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 :(
2570 if ($ev->{button} == 1) { 2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag}; 2718 my $targ = $::CONN->{player}{tag};
2572 2719
2573 if ($item->{container} == $::CONN->{player}{tag}) { 2720 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT; 2721 $targ = $main::OPENCONT;
2575 } 2722 }
2576 2723
2577 $::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}");
2578 } elsif ($ev->{button} == 2) { 2727 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}"); 2728 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) { 2729 } elsif ($ev->{button} == 3) {
2581 my @menu_items = ( 2730 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2584 ["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}) }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [ 2742 )
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ], 2743 ),
2590 ); 2744 );
2591 2745
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 } 2747 }
2594 2748
… …
2630 2784
2631sub new { 2785sub new {
2632 my $class = shift; 2786 my $class = shift;
2633 2787
2634 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox), 2789 scrolled => (new CFClient::UI::Table),
2636 @_, 2790 @_,
2637 ); 2791 );
2638 2792
2639 $self 2793 $self
2640} 2794}
… …
2651 } @$items; 2805 } @$items;
2652 2806
2653 $self->{real_items} = \@items; 2807 $self->{real_items} = \@items;
2654 2808
2655 for my $item (@items) { 2809 for my $item (@items) {
2810 $item->{item} = $item;
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item (); 2812 $item->update_item ();
2658 } 2813 }
2659 2814
2815 my $i = 0;
2816 for (@items) {
2660 $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 }
2661 2821
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663} 2823}
2664 2824
2665sub size_request { 2825sub size_request {
… …
2937 $child->{x} = int $child->{x}; 3097 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y}; 3098 $child->{y} = int $child->{y};
2939 } 3099 }
2940 3100
2941 $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 }
2942} 3120}
2943 3121
2944sub on_refresh { 3122sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3123 my ($self, $id, $cb) = @_;
2946 3124
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3194 glClear GL_COLOR_BUFFER_BIT;
3017 3195
3018 glMatrixMode GL_PROJECTION; 3196 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3197 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3199 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3200 glLoadIdentity;
3023 3201
3024 $self->_draw; 3202 $self->_draw;
3025} 3203}

Diff Legend

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