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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 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) = @_;
… …
814 816
815 my $slider = new CFClient::UI::Slider 817 my $slider = new CFClient::UI::Slider
816 vertical => 1, 818 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 819 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 820 connect_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1]);
820 }, 822 },
821 ; 823 ;
822 824
823 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 826 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 832 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 833 $self->add ($self->{slider});
832 834
833 $self 835 $self
836}
837
838sub size_allocate {
839 my ($self, $w, $h) = @_;
840
841 $self->SUPER::size_allocate ($w, $h);
842
843 my $child = $self->{vp}->child;
844 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 845}
835 846
836#TODO# update range on size_allocate depending on child 847#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 848# update viewport offset on scroll
838 849
… …
1488 active_fg => [0, 0, 0], 1499 active_fg => [0, 0, 0],
1489 can_hover => 1, 1500 can_hover => 1,
1490 can_focus => 1, 1501 can_focus => 1,
1491 valign => 0, 1502 valign => 0,
1492 can_events => 1, 1503 can_events => 1,
1504 #text => ...
1493 @_ 1505 @_
1494 ) 1506 )
1495} 1507}
1496 1508
1497sub _set_text { 1509sub _set_text {
… …
2067 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2081 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2082 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2084 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2085 req_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2086 req_h => $::WIDTH / 80,
2075 vertical => 0, 2087 vertical => 0,
2076 can_hover => 1, 2088 can_hover => 1,
2077 inner_pad => 0.02, 2089 inner_pad => 0.02,
… …
2082 $self->update; 2094 $self->update;
2083 2095
2084 $self 2096 $self
2085} 2097}
2086 2098
2099sub set_range {
2100 my ($self, $range) = @_;
2101
2102 $self->{range} = $range;
2103
2104 $self->update;
2105}
2106
2087sub set_value { 2107sub set_value {
2088 my ($self, $value) = @_; 2108 my ($self, $value) = @_;
2089 2109
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2110 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2111
2092 $hi = $lo + 1 if $hi <= $lo; 2112 $hi = $lo + 1 if $hi <= $lo;
2093 2113
2114 $page = $hi - $lo if $page > $hi - $lo;
2115
2094 $value = $lo if $value < $lo; 2116 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2117 $value = $hi - $page if $value > $hi - $page;
2096 2118
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2120 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101 2121
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2123
2104 if ($value != $old_value) { 2124 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2125 $self->emit (changed => $value);
… …
2118 2138
2119sub button_down { 2139sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2140 my ($self, $ev, $x, $y) = @_;
2121 2141
2122 $self->SUPER::button_down ($ev, $x, $y); 2142 $self->SUPER::button_down ($ev, $x, $y);
2143
2144 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2145
2123 $self->mouse_motion ($ev, $x, $y); 2146 $self->mouse_motion ($ev, $x, $y);
2124} 2147}
2125 2148
2126sub mouse_motion { 2149sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2150 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2152 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2153 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2154
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2155 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2156
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2157 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2158
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2159 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2160 }
2138} 2161}
2139 2162
2140sub update { 2163sub update {
2141 my ($self) = @_; 2164 my ($self) = @_;
2142 2165
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2166 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2167 $self->set_value ($self->{range}[0]);
2145 2168
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2169 my ($value, $lo, $hi, $page) = @{$self->{range}};
2170 my $range = ($hi - $page - $lo) || 1e-100;
2147 2171
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2172 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2173
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2174 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2175 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2176
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2177 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2178 $value = $value * $self->{scale} + $self->{offset};
2154 2179
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; 2180 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2181 $self->{knob_w} = $knob_w;
2162 }); 2182 });
2163 2183
2164 $self->SUPER::update; 2184 $self->SUPER::update;
2165} 2185}
2166 2186
… …
2190 # draw handle 2210 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2211 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2212
2193 glDisable GL_TEXTURE_2D; 2213 glDisable GL_TEXTURE_2D;
2194} 2214}
2215
2216#############################################################################
2217
2218package CFClient::UI::ValSlider;
2219
2220our @ISA = CFClient::UI::HBox::;
2221
2222sub new {
2223 my ($class, %arg) = @_;
2224
2225 my $range = delete $arg{range};
2226
2227 my $self = $class->SUPER::new (
2228 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2229 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2230 to_value => sub { shift },
2231 from_value => sub { shift },
2232 %arg,
2233 );
2234
2235 $self->{slider}->connect (changed => sub {
2236 my ($self, $value) = @_;
2237 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2238 $self->{parent}->emit (changed => $value);
2239 });
2240
2241# $self->{entry}->connect (changed => sub {
2242# my ($self, $value) = @_;
2243# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2244# $self->{parent}->emit (changed => $value);
2245# });
2246
2247 $self->add ($self->{slider}, $self->{entry});
2248
2249 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2250
2251 $self
2252}
2253
2254sub set_range { shift->{slider}->set_range (@_) }
2255sub set_value { shift->{slider}->set_value (@_) }
2195 2256
2196############################################################################# 2257#############################################################################
2197 2258
2198package CFClient::UI::TextView; 2259package CFClient::UI::TextView;
2199 2260
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2302 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2303
2243 $self->reflow; 2304 $self->reflow;
2244} 2305}
2245 2306
2246sub text_height { 2307sub text_size {
2247 my ($self, $text, $indent) = @_; 2308 my ($self, $text, $indent) = @_;
2248 2309
2249 my $layout = $self->{layout}; 2310 my $layout = $self->{layout};
2250 2311
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2312 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2313 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2314 $layout->set_markup ($text);
2254 2315
2255 ($layout->size)[1] 2316 $layout->size
2256} 2317}
2257 2318
2258sub reflow { 2319sub reflow {
2259 my ($self) = @_; 2320 my ($self) = @_;
2260 2321
2261 $self->{need_reflow}++; 2322 $self->{need_reflow}++;
2262 $self->update; 2323 $self->update;
2263} 2324}
2264 2325
2326sub set_offset {
2327 my ($self, $offset) = @_;
2328
2329 # todo: base offset on lines or so, not on pixels
2330 $self->{children}[1]->set_value ($offset);
2331}
2332
2333sub clear {
2334 my ($self) = @_;
2335
2336 $self->{par} = [];
2337 $self->{height} = 0;
2338 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2339}
2340
2265sub add_paragraph { 2341sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2342 my ($self, $color, $text, $indent) = @_;
2267 2343
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2344 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2345 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2346 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2347 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2348 }
2275 2349
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2350 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2351}
2279 2352
2280sub update { 2353sub update {
2281 my ($self) = @_; 2354 my ($self) = @_;
2282 2355
… …
2285 return unless $self->{h} > 0; 2358 return unless $self->{h} > 0;
2286 2359
2287 delete $self->{texture}; 2360 delete $self->{texture};
2288 2361
2289 $ROOT->on_post_alloc ($self, sub { 2362 $ROOT->on_post_alloc ($self, sub {
2363 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2364
2290 if (delete $self->{need_reflow}) { 2365 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2366 my $height = 0;
2292 2367
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2368 my $layout = $self->{layout};
2369
2370 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2371
2294 for @{$self->{par}}; 2372 for (@{$self->{par}}) {
2373 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2374 $layout->set_width ($W - $_->[3]);
2375 $layout->set_markup ($_->[4]);
2376 my ($w, $h) = $layout->size;
2377 $_->[0] = $w + $_->[3];
2378 $_->[1] = $h;
2379 }
2380
2381 $height += $_->[1];
2382 }
2295 2383
2296 $self->{height} = $height; 2384 $self->{height} = $height;
2297 2385
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2386 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2387
2301 delete $self->{texture}; 2388 delete $self->{texture};
2302 } 2389 }
2303 2390
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2391 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2392 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2393 glClear GL_COLOR_BUFFER_BIT;
2307 2394
2308 my $top = int $self->{children}[1]{range}[0]; 2395 my $top = int $self->{children}[1]{range}[0];
2309 2396
2310 my $y0 = $top; 2397 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2398 my $y1 = $top + $H;
2312 2399
2313 my $y = 0; 2400 my $y = 0;
2314 2401
2315 my $layout = $self->{layout}; 2402 my $layout = $self->{layout};
2316 2403
2317 $layout->set_font ($self->{font}) if $self->{font}; 2404 $layout->set_font ($self->{font}) if $self->{font};
2318 2405
2319 glEnable GL_BLEND; 2406 glEnable GL_BLEND;
2407 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2408 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2409
2322 for my $par (@{$self->{par}}) { 2410 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2411 my $h = $par->[1];
2324 2412
2325 if ($y0 < $y + $h && $y < $y1) { 2413 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2414 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2415 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2416 $layout->set_markup ($par->[4]);
2329 2417
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2418 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2419
2332 glRasterPos $par->[2], $y - $y0; 2420 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2421 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2422 }
2335 2423
2336 $y += $h; 2424 $y += $h;
2337 } 2425 }
… …
2552} 2640}
2553 2641
2554sub _draw { 2642sub _draw {
2555 my ($self) = @_; 2643 my ($self) = @_;
2556 2644
2557 return unless $::CONN;#d# manage and cache textures differently 2645 return unless $::CONN;
2558 2646
2559 my $face; 2647 my $face;
2560 2648
2561 if ($self->{frame}) { 2649 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2650 my $anim = $::CONN->{anim}[$self->{anim}];
… …
3009} 3097}
3010 3098
3011sub add { 3099sub add {
3012 my ($self, @children) = @_; 3100 my ($self, @children) = @_;
3013 3101
3102 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children;
3104 $w->{root} = $self;
3105 $w->{visible} = 1;
3106 }
3107
3014 for my $child (@children) { 3108 for my $child (@children) {
3015 $child->{toplevel} = 1; 3109 $child->{toplevel} = 1;
3016 3110
3017 # integerise window positions 3111 # integerise window positions
3018 $child->{x} = int $child->{x}; 3112 $child->{x} = int $child->{x};
3019 $child->{y} = int $child->{y}; 3113 $child->{y} = int $child->{y};
3020 } 3114 }
3021 3115
3022 $self->SUPER::add (@children); 3116 $self->SUPER::add (@children);
3023
3024 while (@children) {
3025 my $w = pop @children;
3026 push @children, $w->children;
3027 $w->{visible} = 1;
3028 }
3029} 3117}
3030 3118
3031sub remove { 3119sub remove {
3032 my ($self, @children) = @_; 3120 my ($self, @children) = @_;
3033 3121

Diff Legend

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