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.226 by root, Tue May 23 23:14:46 2006 UTC vs.
Revision 1.228 by root, Wed May 24 03:52:54 2006 UTC

… …
2070 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2074 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2078 vertical => 0, 2078 vertical => 0,
2079 can_hover => 1, 2079 can_hover => 1,
2080 inner_pad => 0.02, 2080 inner_pad => 0.02,
… …
2100 2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2102
2103 $hi = $lo + 1 if $hi <= $lo; 2103 $hi = $lo + 1 if $hi <= $lo;
2104 2104
2105 $page = $hi - $lo if $page > $hi - $lo;
2106
2105 $value = $lo if $value < $lo; 2107 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2108 $value = $hi - $page if $value > $hi - $page;
2107 2109
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2110 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2111 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112 2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2114
2115 if ($value != $old_value) { 2115 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2116 $self->emit (changed => $value);
… …
2129 2129
2130sub button_down { 2130sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
2132 2132
2133 $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
2134 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
2135} 2138}
2136 2139
2137sub mouse_motion { 2140sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
… …
2140 if ($GRAB == $self) { 2143 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2145
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2146 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2147
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2149
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2148 } 2151 }
2149} 2152}
2150 2153
2151sub update { 2154sub update {
2152 my ($self) = @_; 2155 my ($self) = @_;
2153 2156
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]); 2158 $self->set_value ($self->{range}[0]);
2156 2159
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
2158 2162
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2164
2161 $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;
2162 2167
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2168 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2169 $value = $value * $self->{scale} + $self->{offset};
2165 2170
2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value; 2171 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2172 $self->{knob_w} = $knob_w;
2173 }); 2173 });
2174 2174
2175 $self->SUPER::update; 2175 $self->SUPER::update;
2176} 2176}
2177 2177
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2294
2295 $self->reflow; 2295 $self->reflow;
2296} 2296}
2297 2297
2298sub text_height { 2298sub text_size {
2299 my ($self, $text, $indent) = @_; 2299 my ($self, $text, $indent) = @_;
2300 2300
2301 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2302 2302
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2306 2306
2307 ($layout->size)[1] 2307 $layout->size
2308} 2308}
2309 2309
2310sub reflow { 2310sub reflow {
2311 my ($self) = @_; 2311 my ($self) = @_;
2312 2312
2313 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2314 $self->update; 2314 $self->update;
2315} 2315}
2316 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
2317sub clear { 2324sub clear {
2318 my ($self) = @_; 2325 my ($self) = @_;
2319 2326
2320 $self->{par} = []; 2327 $self->{par} = [];
2321 $self->{height} = 0; 2328 $self->{height} = 0;
2322 2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2323 $self->reflow;
2324} 2330}
2325 2331
2326sub add_paragraph { 2332sub add_paragraph {
2327 my ($self, $color, $text, $indent) = @_; 2333 my ($self, $color, $text, $indent) = @_;
2328 2334
2329 for my $line (split /\n/, $text) { 2335 for my $line (split /\n/, $text) {
2330 my $height = $self->text_height ($line); 2336 my ($w, $h) = $self->text_size ($line);
2331 $self->{height} += $height; 2337 $self->{height} += $h;
2332 push @{$self->{par}}, [$height, $color, $indent, $line]; 2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2333 } 2339 }
2334 2340
2335 $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]);
2336 $self->{children}[1]->update;
2337} 2342}
2338 2343
2339sub update { 2344sub update {
2340 my ($self) = @_; 2345 my ($self) = @_;
2341 2346
… …
2344 return unless $self->{h} > 0; 2349 return unless $self->{h} > 0;
2345 2350
2346 delete $self->{texture}; 2351 delete $self->{texture};
2347 2352
2348 $ROOT->on_post_alloc ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355
2349 if (delete $self->{need_reflow}) { 2356 if (delete $self->{need_reflow}) {
2350 my $height = 0; 2357 my $height = 0;
2351 2358
2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2359 my $layout = $self->{layout};
2360
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362
2353 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 }
2354 2374
2355 $self->{height} = $height; 2375 $self->{height} = $height;
2356 2376
2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2358 $self->{children}[1]->update;
2359 2378
2360 delete $self->{texture}; 2379 delete $self->{texture};
2361 } 2380 }
2362 2381
2363 $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 {
2364 glClearColor 0.5, 0.5, 0.5, 0; 2383 glClearColor 0.5, 0.5, 0.5, 0;
2365 glClear GL_COLOR_BUFFER_BIT; 2384 glClear GL_COLOR_BUFFER_BIT;
2366 2385
2367 my $top = int $self->{children}[1]{range}[0]; 2386 my $top = int $self->{children}[1]{range}[0];
2368 2387
2369 my $y0 = $top; 2388 my $y0 = $top;
2370 my $y1 = $top + $self->{h}; 2389 my $y1 = $top + $H;
2371 2390
2372 my $y = 0; 2391 my $y = 0;
2373 2392
2374 my $layout = $self->{layout}; 2393 my $layout = $self->{layout};
2375 2394
2376 $layout->set_font ($self->{font}) if $self->{font}; 2395 $layout->set_font ($self->{font}) if $self->{font};
2377 2396
2378 glEnable GL_BLEND; 2397 glEnable GL_BLEND;
2398 #TODO# not correct in windows where rgba is forced off
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2399 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380 2400
2381 for my $par (@{$self->{par}}) { 2401 for my $par (@{$self->{par}}) {
2382 my $h = $par->[0]; 2402 my $h = $par->[1];
2383 2403
2384 if ($y0 < $y + $h && $y < $y1) { 2404 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] }); 2405 $layout->set_foreground (@{ $par->[2] });
2386 $layout->set_width ($self->{w} - $par->[2]); 2406 $layout->set_width ($W - $par->[3]);
2387 $layout->set_markup ($par->[3]); 2407 $layout->set_markup ($par->[4]);
2388 2408
2389 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2409 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2390 2410
2391 glRasterPos $par->[2], $y - $y0; 2411 glRasterPos $par->[3], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2412 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2393 } 2413 }
2394 2414
2395 $y += $h; 2415 $y += $h;
2396 } 2416 }
… …
2611} 2631}
2612 2632
2613sub _draw { 2633sub _draw {
2614 my ($self) = @_; 2634 my ($self) = @_;
2615 2635
2616 return unless $::CONN;#d# manage and cache textures differently 2636 return unless $::CONN;
2617 2637
2618 my $face; 2638 my $face;
2619 2639
2620 if ($self->{frame}) { 2640 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}]; 2641 my $anim = $::CONN->{anim}[$self->{anim}];

Diff Legend

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