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.223 by elmex, Tue May 23 18:10:51 2006 UTC vs.
Revision 1.228 by root, Wed May 24 03:52:54 2006 UTC

… …
743 743
744sub size_request { 744sub size_request {
745 my ($self) = @_; 745 my ($self) = @_;
746 746
747 @$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)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 748
750 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
751} 750}
752 751
753sub size_allocate { 752sub size_allocate {
754 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
755 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
756 $self->update; 758 $self->update;
757} 759}
758 760
759sub set_offset { 761sub set_offset {
760 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
1488 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1489 can_hover => 1, 1491 can_hover => 1,
1490 can_focus => 1, 1492 can_focus => 1,
1491 valign => 0, 1493 valign => 0,
1492 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1493 @_ 1496 @_
1494 ) 1497 )
1495} 1498}
1496 1499
1497sub _set_text { 1500sub _set_text {
… …
2067 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2073 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2074 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2075 vertical => 0, 2078 vertical => 0,
2076 can_hover => 1, 2079 can_hover => 1,
2077 inner_pad => 0.02, 2080 inner_pad => 0.02,
… …
2082 $self->update; 2085 $self->update;
2083 2086
2084 $self 2087 $self
2085} 2088}
2086 2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2087sub set_value { 2098sub set_value {
2088 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2089 2100
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2102
2092 $hi = $lo + 1 if $hi <= $lo; 2103 $hi = $lo + 1 if $hi <= $lo;
2093 2104
2105 $page = $hi - $lo if $page > $hi - $lo;
2106
2094 $value = $lo if $value < $lo; 2107 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2108 $value = $hi - $page if $value > $hi - $page;
2096 2109
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2110 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2111 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101 2112
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2114
2104 if ($value != $old_value) { 2115 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2116 $self->emit (changed => $value);
… …
2118 2129
2119sub button_down { 2130sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
2121 2132
2122 $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
2123 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
2124} 2138}
2125 2139
2126sub mouse_motion { 2140sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2143 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2145
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2146 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2147
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2149
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2151 }
2138} 2152}
2139 2153
2140sub update { 2154sub update {
2141 my ($self) = @_; 2155 my ($self) = @_;
2142 2156
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2158 $self->set_value ($self->{range}[0]);
2145 2159
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
2147 2162
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2164
2150 $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;
2151 2167
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2168 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2169 $value = $value * $self->{scale} + $self->{offset};
2154 2170
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; 2171 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2172 $self->{knob_w} = $knob_w;
2162 }); 2173 });
2163 2174
2164 $self->SUPER::update; 2175 $self->SUPER::update;
2165} 2176}
2166 2177
… …
2190 # draw handle 2201 # draw handle
2191 $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);
2192 2203
2193 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2194} 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 (@_) }
2195 2247
2196############################################################################# 2248#############################################################################
2197 2249
2198package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2199 2251
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2294
2243 $self->reflow; 2295 $self->reflow;
2244} 2296}
2245 2297
2246sub text_height { 2298sub text_size {
2247 my ($self, $text, $indent) = @_; 2299 my ($self, $text, $indent) = @_;
2248 2300
2249 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2250 2302
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2254 2306
2255 ($layout->size)[1] 2307 $layout->size
2256} 2308}
2257 2309
2258sub reflow { 2310sub reflow {
2259 my ($self) = @_; 2311 my ($self) = @_;
2260 2312
2261 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2262 $self->update; 2314 $self->update;
2263} 2315}
2264 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
2265sub add_paragraph { 2332sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2333 my ($self, $color, $text, $indent) = @_;
2267 2334
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2335 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2336 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2337 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2339 }
2275 2340
2276 $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]);
2277 $self->{children}[1]->update;
2278} 2342}
2279 2343
2280sub update { 2344sub update {
2281 my ($self) = @_; 2345 my ($self) = @_;
2282 2346
… …
2285 return unless $self->{h} > 0; 2349 return unless $self->{h} > 0;
2286 2350
2287 delete $self->{texture}; 2351 delete $self->{texture};
2288 2352
2289 $ROOT->on_post_alloc ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355
2290 if (delete $self->{need_reflow}) { 2356 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2357 my $height = 0;
2292 2358
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2359 my $layout = $self->{layout};
2360
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362
2294 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 }
2295 2374
2296 $self->{height} = $height; 2375 $self->{height} = $height;
2297 2376
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2378
2301 delete $self->{texture}; 2379 delete $self->{texture};
2302 } 2380 }
2303 2381
2304 $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 {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2383 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2384 glClear GL_COLOR_BUFFER_BIT;
2307 2385
2308 my $top = int $self->{children}[1]{range}[0]; 2386 my $top = int $self->{children}[1]{range}[0];
2309 2387
2310 my $y0 = $top; 2388 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2389 my $y1 = $top + $H;
2312 2390
2313 my $y = 0; 2391 my $y = 0;
2314 2392
2315 my $layout = $self->{layout}; 2393 my $layout = $self->{layout};
2316 2394
2317 $layout->set_font ($self->{font}) if $self->{font}; 2395 $layout->set_font ($self->{font}) if $self->{font};
2318 2396
2319 glEnable GL_BLEND; 2397 glEnable GL_BLEND;
2398 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2399 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2400
2322 for my $par (@{$self->{par}}) { 2401 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2402 my $h = $par->[1];
2324 2403
2325 if ($y0 < $y + $h && $y < $y1) { 2404 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2405 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2406 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2407 $layout->set_markup ($par->[4]);
2329 2408
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2409 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2410
2332 glRasterPos $par->[2], $y - $y0; 2411 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2412 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2413 }
2335 2414
2336 $y += $h; 2415 $y += $h;
2337 } 2416 }
… …
2552} 2631}
2553 2632
2554sub _draw { 2633sub _draw {
2555 my ($self) = @_; 2634 my ($self) = @_;
2556 2635
2557 return unless $::CONN;#d# manage and cache textures differently 2636 return unless $::CONN;
2558 2637
2559 my $face; 2638 my $face;
2560 2639
2561 if ($self->{frame}) { 2640 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2641 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2628 2707
2629 my $self = $class->SUPER::new ( 2708 my $self = $class->SUPER::new (
2630 can_hover => 1, 2709 can_hover => 1,
2631 can_events => 1, 2710 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc) 2711 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\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>"),
2634 connect_button_down => sub { 2713 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_; 2714 my ($self, $ev, $x, $y) = @_;
2636 2715
2637 # 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 :(
2638 if ($ev->{button} == 1) { 2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag}; 2718 my $targ = $::CONN->{player}{tag};
2640 2719
2641 if ($item->{container} == $::CONN->{player}{tag}) { 2720 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT; 2721 $targ = $main::OPENCONT;
2643 } 2722 }
2644 2723
2645 $::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}");
2646 } elsif ($ev->{button} == 2) { 2727 } elsif ($ev->{button} == 2) {
2647 $::CONN->send ("apply $item->{tag}"); 2728 $::CONN->send ("apply $item->{tag}");
2648 } elsif ($ev->{button} == 3) { 2729 } elsif ($ev->{button} == 3) {
2649 my @menu_items = ( 2730 my @menu_items = (
2650 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
… …
2703 2784
2704sub new { 2785sub new {
2705 my $class = shift; 2786 my $class = shift;
2706 2787
2707 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2708 scrolled => (new CFClient::UI::VBox), 2789 scrolled => (new CFClient::UI::Table),
2709 @_, 2790 @_,
2710 ); 2791 );
2711 2792
2712 $self 2793 $self
2713} 2794}
… …
2724 } @$items; 2805 } @$items;
2725 2806
2726 $self->{real_items} = \@items; 2807 $self->{real_items} = \@items;
2727 2808
2728 for my $item (@items) { 2809 for my $item (@items) {
2810 $item->{item} = $item;
2729 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2730 $item->update_item (); 2812 $item->update_item ();
2731 } 2813 }
2732 2814
2815 my $i = 0;
2816 for (@items) {
2733 $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 }
2734 2821
2735# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2736} 2823}
2737 2824
2738sub size_request { 2825sub size_request {

Diff Legend

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