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.221 by root, Mon May 22 03:48:50 2006 UTC vs.
Revision 1.230 by root, Wed May 24 21:59:54 2006 UTC

… …
144 144
145 $_->update 145 $_->update
146 for @widgets; 146 for @widgets;
147} 147}
148 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
149# call when resolution changes etc. 157# call when resolution changes etc.
150sub rescale_widgets { 158sub rescale_widgets {
151 my ($sx, $sy) = @_; 159 my ($sx, $sy) = @_;
152 160
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 161 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 162 if ($widget->{is_toplevel}) {
158 $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};
159 $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};
160 $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};
161 $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};
162 $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};
163 $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};
164 $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};
165 $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};
166 } 171 }
167
168 $widget->reconfigure;
169 } 172 }
173
174 reconfigure_widgets;
170} 175}
171 176
172############################################################################# 177#############################################################################
173 178
174package CFClient::UI::Base; 179package CFClient::UI::Base;
… …
206 %$self = (); 211 %$self = ();
207} 212}
208 213
209sub show { 214sub show {
210 my ($self) = @_; 215 my ($self) = @_;
211
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
218 return if $self->{parent}; 216 return if $self->{parent};
219 217
220 $CFClient::UI::ROOT->add ($self); 218 $CFClient::UI::ROOT->add ($self);
221} 219}
222 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 );
232}
233
223sub hide { 234sub hide {
224 my ($self) = @_; 235 my ($self) = @_;
225
226 for (my @w = $self; @w; ) {
227 my $w = pop @w;
228 push @w, $w->children;
229 $w->{visible} = 1;
230 }
231 236
232 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
234 239
235 $self->{parent}->remove ($self) 240 $self->{parent}->remove ($self)
… …
743 748
744sub size_request { 749sub size_request {
745 my ($self) = @_; 750 my ($self) = @_;
746 751
747 @$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)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 753
750 @$self{qw(child_w child_h)} 754 @$self{qw(child_w child_h)}
751} 755}
752 756
753sub size_allocate { 757sub size_allocate {
754 my ($self, $w, $h) = @_; 758 my ($self, $w, $h) = @_;
755 759
760 my ($cw, $ch) = @$self{qw(child_w child_h)};
761# $w = $self->{w};
762 $self->child->configure (0, 0, $cw, $ch);
756 $self->update; 763 $self->update;
757} 764}
758 765
759sub set_offset { 766sub set_offset {
760 my ($self, $x, $y) = @_; 767 my ($self, $x, $y) = @_;
… …
814 821
815 my $slider = new CFClient::UI::Slider 822 my $slider = new CFClient::UI::Slider
816 vertical => 1, 823 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 824 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 825 connect_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 826 $self->{vp}->set_offset (0, $_[1]);
820 }, 827 },
821 ; 828 ;
822 829
823 $self = $class->SUPER::new ( 830 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 831 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 836 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 837 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 838 $self->add ($self->{slider});
832 839
833 $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]);
834} 850}
835 851
836#TODO# update range on size_allocate depending on child 852#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 853# update viewport offset on scroll
838 854
… …
892 my $class = shift; 908 my $class = shift;
893 909
894 # TODO: user_x, user_y, overwrite moveto? 910 # TODO: user_x, user_y, overwrite moveto?
895 911
896 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 913 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 914 border_bg => [1, 1, 1, 1],
899 border => 0.6, 915 border => 0.6,
900 toplevel => 1, 916 is_toplevel => 1,
901 can_events => 1, 917 can_events => 1,
902 @_ 918 @_
903 ); 919 );
904 920
905 $self->{title} &&= new CFClient::UI::Label 921 $self->{title} &&= new CFClient::UI::Label
906 align => 0, 922 align => 0,
… …
1488 active_fg => [0, 0, 0], 1504 active_fg => [0, 0, 0],
1489 can_hover => 1, 1505 can_hover => 1,
1490 can_focus => 1, 1506 can_focus => 1,
1491 valign => 0, 1507 valign => 0,
1492 can_events => 1, 1508 can_events => 1,
1509 #text => ...
1493 @_ 1510 @_
1494 ) 1511 )
1495} 1512}
1496 1513
1497sub _set_text { 1514sub _set_text {
… …
2067 my $self = $class->SUPER::new ( 2084 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2086 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2089 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2090 req_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2091 req_h => $::WIDTH / 80,
2075 vertical => 0, 2092 vertical => 0,
2076 can_hover => 1, 2093 can_hover => 1,
2077 inner_pad => 0.02, 2094 inner_pad => 0.02,
… …
2082 $self->update; 2099 $self->update;
2083 2100
2084 $self 2101 $self
2085} 2102}
2086 2103
2104sub set_range {
2105 my ($self, $range) = @_;
2106
2107 $self->{range} = $range;
2108
2109 $self->update;
2110}
2111
2087sub set_value { 2112sub set_value {
2088 my ($self, $value) = @_; 2113 my ($self, $value) = @_;
2089 2114
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2115 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2116
2092 $hi = $lo + 1 if $hi <= $lo; 2117 $hi = $lo + 1 if $hi <= $lo;
2093 2118
2119 $page = $hi - $lo if $page > $hi - $lo;
2120
2094 $value = $lo if $value < $lo; 2121 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2122 $value = $hi - $page if $value > $hi - $page;
2096 2123
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2124 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2125 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101 2126
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2128
2104 if ($value != $old_value) { 2129 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2130 $self->emit (changed => $value);
… …
2118 2143
2119sub button_down { 2144sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
2121 2146
2122 $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
2123 $self->mouse_motion ($ev, $x, $y); 2151 $self->mouse_motion ($ev, $x, $y);
2124} 2152}
2125 2153
2126sub mouse_motion { 2154sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2155 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2157 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2159
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2160 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2161
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2163
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2165 }
2138} 2166}
2139 2167
2140sub update { 2168sub update {
2141 my ($self) = @_; 2169 my ($self) = @_;
2142 2170
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2172 $self->set_value ($self->{range}[0]);
2145 2173
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2174 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100;
2147 2176
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2177 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2178
2150 $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;
2151 2181
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2182 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2183 $value = $value * $self->{scale} + $self->{offset};
2154 2184
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2185 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2186 $self->{knob_w} = $knob_w;
2162 }); 2187 });
2163 2188
2164 $self->SUPER::update; 2189 $self->SUPER::update;
2165} 2190}
2166 2191
… …
2190 # draw handle 2215 # draw handle
2191 $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);
2192 2217
2193 glDisable GL_TEXTURE_2D; 2218 glDisable GL_TEXTURE_2D;
2194} 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 (@_) }
2195 2261
2196############################################################################# 2262#############################################################################
2197 2263
2198package CFClient::UI::TextView; 2264package CFClient::UI::TextView;
2199 2265
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2307 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2308
2243 $self->reflow; 2309 $self->reflow;
2244} 2310}
2245 2311
2246sub text_height { 2312sub text_size {
2247 my ($self, $text, $indent) = @_; 2313 my ($self, $text, $indent) = @_;
2248 2314
2249 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2250 2316
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2318 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2319 $layout->set_markup ($text);
2254 2320
2255 ($layout->size)[1] 2321 $layout->size
2256} 2322}
2257 2323
2258sub reflow { 2324sub reflow {
2259 my ($self) = @_; 2325 my ($self) = @_;
2260 2326
2261 $self->{need_reflow}++; 2327 $self->{need_reflow}++;
2262 $self->update; 2328 $self->update;
2263} 2329}
2264 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
2265sub add_paragraph { 2346sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2347 my ($self, $color, $text, $indent) = @_;
2267 2348
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2349 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2350 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2351 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2353 }
2275 2354
2276 $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]);
2277 $self->{children}[1]->update;
2278} 2356}
2279 2357
2280sub update { 2358sub update {
2281 my ($self) = @_; 2359 my ($self) = @_;
2282 2360
… …
2285 return unless $self->{h} > 0; 2363 return unless $self->{h} > 0;
2286 2364
2287 delete $self->{texture}; 2365 delete $self->{texture};
2288 2366
2289 $ROOT->on_post_alloc ($self, sub { 2367 $ROOT->on_post_alloc ($self, sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369
2290 if (delete $self->{need_reflow}) { 2370 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2371 my $height = 0;
2292 2372
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2294 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 }
2295 2388
2296 $self->{height} = $height; 2389 $self->{height} = $height;
2297 2390
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2392
2301 delete $self->{texture}; 2393 delete $self->{texture};
2302 } 2394 }
2303 2395
2304 $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 {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2397 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2398 glClear GL_COLOR_BUFFER_BIT;
2307 2399
2308 my $top = int $self->{children}[1]{range}[0]; 2400 my $top = int $self->{children}[1]{range}[0];
2309 2401
2310 my $y0 = $top; 2402 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2403 my $y1 = $top + $H;
2312 2404
2313 my $y = 0; 2405 my $y = 0;
2314 2406
2315 my $layout = $self->{layout}; 2407 my $layout = $self->{layout};
2316 2408
2317 $layout->set_font ($self->{font}) if $self->{font}; 2409 $layout->set_font ($self->{font}) if $self->{font};
2318 2410
2319 glEnable GL_BLEND; 2411 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2414
2322 for my $par (@{$self->{par}}) { 2415 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2416 my $h = $par->[1];
2324 2417
2325 if ($y0 < $y + $h && $y < $y1) { 2418 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2419 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2420 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2421 $layout->set_markup ($par->[4]);
2329 2422
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2423 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2424
2332 glRasterPos $par->[2], $y - $y0; 2425 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2427 }
2335 2428
2336 $y += $h; 2429 $y += $h;
2337 } 2430 }
… …
2541 2634
2542sub size_request { 2635sub size_request {
2543 (32, 8) 2636 (32, 8)
2544} 2637}
2545 2638
2639sub update {
2640 my ($self) = @_;
2641
2642 return unless $self->{visible};
2643
2644 $self->SUPER::update;
2645}
2646
2546sub _draw { 2647sub _draw {
2547 my ($self) = @_; 2648 my ($self) = @_;
2548 2649
2549 return unless $::CONN;#d# manage and cache textures differently 2650 return unless $::CONN;
2550 2651
2551 my $face; 2652 my $face;
2552 2653
2553 if ($self->{frame}) { 2654 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}]; 2655 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2620 2721
2621 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2622 can_hover => 1, 2723 can_hover => 1,
2623 can_events => 1, 2724 can_events => 1,
2624 tooltip => ((CFClient::UI::Label::escape $desc) 2725 tooltip => ((CFClient::UI::Label::escape $desc)
2625 . "\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>"),
2626 connect_button_down => sub { 2727 connect_button_down => sub {
2627 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2628 2729
2629 # 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 :(
2630 if ($ev->{button} == 1) { 2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag}; 2732 my $targ = $::CONN->{player}{tag};
2632 2733
2633 if ($item->{container} == $::CONN->{player}{tag}) { 2734 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT; 2735 $targ = $main::OPENCONT;
2635 } 2736 }
2636 2737
2637 $::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}");
2638 } elsif ($ev->{button} == 2) { 2741 } elsif ($ev->{button} == 2) {
2639 $::CONN->send ("apply $item->{tag}"); 2742 $::CONN->send ("apply $item->{tag}");
2640 } elsif ($ev->{button} == 3) { 2743 } elsif ($ev->{button} == 3) {
2641 my @menu_items = ( 2744 my @menu_items = (
2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
… …
2695 2798
2696sub new { 2799sub new {
2697 my $class = shift; 2800 my $class = shift;
2698 2801
2699 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2700 scrolled => (new CFClient::UI::VBox), 2803 scrolled => (new CFClient::UI::Table),
2701 @_, 2804 @_,
2702 ); 2805 );
2703 2806
2704 $self 2807 $self
2705} 2808}
… …
2716 } @$items; 2819 } @$items;
2717 2820
2718 $self->{real_items} = \@items; 2821 $self->{real_items} = \@items;
2719 2822
2720 for my $item (@items) { 2823 for my $item (@items) {
2824 $item->{item} = $item;
2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item (); 2826 $item->update_item ();
2723 } 2827 }
2724 2828
2829 my $i = 0;
2830 for (@items) {
2725 $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 }
2726 2835
2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2728} 2837}
2729 2838
2730sub size_request { 2839sub size_request {
… …
2949} 3058}
2950 3059
2951sub size_allocate { 3060sub size_allocate {
2952 my ($self, $w, $h) = @_; 3061 my ($self, $w, $h) = @_;
2953 3062
2954 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2955 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2956
2957 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2959
2960 for my $child ($self->children) { 3063 for my $child ($self->children) {
2961 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)};
2962 3065
2963 $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
2964 if exists $child->{req_x}; 3067 if exists $child->{req_x};
… …
2993} 3096}
2994 3097
2995sub add { 3098sub add {
2996 my ($self, @children) = @_; 3099 my ($self, @children) = @_;
2997 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
2998 for my $child (@children) { 3107 for my $child (@children) {
2999 $child->{toplevel} = 1; 3108 $child->{is_toplevel} = 1;
3000 3109
3001 # integerise window positions 3110 # integerise window positions
3002 $child->{x} = int $child->{x}; 3111 $child->{x} = int $child->{x};
3003 $child->{y} = int $child->{y}; 3112 $child->{y} = int $child->{y};
3004 } 3113 }
3005 3114
3006 $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 }
3007} 3128}
3008 3129
3009sub on_refresh { 3130sub on_refresh {
3010 my ($self, $id, $cb) = @_; 3131 my ($self, $id, $cb) = @_;
3011 3132

Diff Legend

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