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.225 by root, Tue May 23 21:14:41 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;
… …
816 821
817 my $slider = new CFClient::UI::Slider 822 my $slider = new CFClient::UI::Slider
818 vertical => 1, 823 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 824 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 825 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 826 $self->{vp}->set_offset (0, $_[1]);
822 }, 827 },
823 ; 828 ;
824 829
825 $self = $class->SUPER::new ( 830 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 831 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 836 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 837 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 838 $self->add ($self->{slider});
834 839
835 $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]);
836} 850}
837 851
838#TODO# update range on size_allocate depending on child 852#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 853# update viewport offset on scroll
840 854
… …
894 my $class = shift; 908 my $class = shift;
895 909
896 # TODO: user_x, user_y, overwrite moveto? 910 # TODO: user_x, user_y, overwrite moveto?
897 911
898 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 913 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 914 border_bg => [1, 1, 1, 1],
901 border => 0.6, 915 border => 0.6,
902 toplevel => 1, 916 is_toplevel => 1,
903 can_events => 1, 917 can_events => 1,
904 @_ 918 @_
905 ); 919 );
906 920
907 $self->{title} &&= new CFClient::UI::Label 921 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 922 align => 0,
… …
2070 my $self = $class->SUPER::new ( 2084 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2086 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2089 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2090 req_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2091 req_h => $::WIDTH / 80,
2078 vertical => 0, 2092 vertical => 0,
2079 can_hover => 1, 2093 can_hover => 1,
2080 inner_pad => 0.02, 2094 inner_pad => 0.02,
… …
2100 2114
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2115 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2116
2103 $hi = $lo + 1 if $hi <= $lo; 2117 $hi = $lo + 1 if $hi <= $lo;
2104 2118
2119 $page = $hi - $lo if $page > $hi - $lo;
2120
2105 $value = $lo if $value < $lo; 2121 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2122 $value = $hi - $page if $value > $hi - $page;
2107 2123
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2124 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2125 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112 2126
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2128
2115 if ($value != $old_value) { 2129 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2130 $self->emit (changed => $value);
… …
2129 2143
2130sub button_down { 2144sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
2132 2146
2133 $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
2134 $self->mouse_motion ($ev, $x, $y); 2151 $self->mouse_motion ($ev, $x, $y);
2135} 2152}
2136 2153
2137sub mouse_motion { 2154sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2155 my ($self, $ev, $x, $y) = @_;
… …
2140 if ($GRAB == $self) { 2157 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2159
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2160 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2161
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2163
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2148 } 2165 }
2149} 2166}
2150 2167
2151sub update { 2168sub update {
2152 my ($self) = @_; 2169 my ($self) = @_;
2153 2170
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]); 2172 $self->set_value ($self->{range}[0]);
2156 2173
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2174 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100;
2158 2176
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2177 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2178
2161 $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;
2162 2181
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2182 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2183 $value = $value * $self->{scale} + $self->{offset};
2165 2184
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; 2185 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2186 $self->{knob_w} = $knob_w;
2173 }); 2187 });
2174 2188
2175 $self->SUPER::update; 2189 $self->SUPER::update;
2176} 2190}
2177 2191
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2307 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2308
2295 $self->reflow; 2309 $self->reflow;
2296} 2310}
2297 2311
2298sub text_height { 2312sub text_size {
2299 my ($self, $text, $indent) = @_; 2313 my ($self, $text, $indent) = @_;
2300 2314
2301 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2302 2316
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2318 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2319 $layout->set_markup ($text);
2306 2320
2307 ($layout->size)[1] 2321 $layout->size
2308} 2322}
2309 2323
2310sub reflow { 2324sub reflow {
2311 my ($self) = @_; 2325 my ($self) = @_;
2312 2326
2313 $self->{need_reflow}++; 2327 $self->{need_reflow}++;
2314 $self->update; 2328 $self->update;
2315} 2329}
2316 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
2317sub add_paragraph { 2346sub add_paragraph {
2318 my ($self, $color, $text, $indent) = @_; 2347 my ($self, $color, $text, $indent) = @_;
2319 2348
2320 #TODO: intelligently "reformat" paragraph
2321
2322 for my $line (split /\n/, $text) { 2349 for my $line (split /\n/, $text) {
2323 my $height = $self->text_height ($line); 2350 my ($w, $h) = $self->text_size ($line);
2324 $self->{height} += $height; 2351 $self->{height} += $h;
2325 push @{$self->{par}}, [$height, $color, $indent, $line]; 2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2326 } 2353 }
2327 2354
2328 $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]);
2329 $self->{children}[1]->update;
2330} 2356}
2331 2357
2332sub update { 2358sub update {
2333 my ($self) = @_; 2359 my ($self) = @_;
2334 2360
… …
2337 return unless $self->{h} > 0; 2363 return unless $self->{h} > 0;
2338 2364
2339 delete $self->{texture}; 2365 delete $self->{texture};
2340 2366
2341 $ROOT->on_post_alloc ($self, sub { 2367 $ROOT->on_post_alloc ($self, sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369
2342 if (delete $self->{need_reflow}) { 2370 if (delete $self->{need_reflow}) {
2343 my $height = 0; 2371 my $height = 0;
2344 2372
2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2346 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 }
2347 2388
2348 $self->{height} = $height; 2389 $self->{height} = $height;
2349 2390
2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2351 $self->{children}[1]->update;
2352 2392
2353 delete $self->{texture}; 2393 delete $self->{texture};
2354 } 2394 }
2355 2395
2356 $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 {
2357 glClearColor 0.5, 0.5, 0.5, 0; 2397 glClearColor 0.5, 0.5, 0.5, 0;
2358 glClear GL_COLOR_BUFFER_BIT; 2398 glClear GL_COLOR_BUFFER_BIT;
2359 2399
2360 my $top = int $self->{children}[1]{range}[0]; 2400 my $top = int $self->{children}[1]{range}[0];
2361 2401
2362 my $y0 = $top; 2402 my $y0 = $top;
2363 my $y1 = $top + $self->{h}; 2403 my $y1 = $top + $H;
2364 2404
2365 my $y = 0; 2405 my $y = 0;
2366 2406
2367 my $layout = $self->{layout}; 2407 my $layout = $self->{layout};
2368 2408
2369 $layout->set_font ($self->{font}) if $self->{font}; 2409 $layout->set_font ($self->{font}) if $self->{font};
2370 2410
2371 glEnable GL_BLEND; 2411 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373 2414
2374 for my $par (@{$self->{par}}) { 2415 for my $par (@{$self->{par}}) {
2375 my $h = $par->[0]; 2416 my $h = $par->[1];
2376 2417
2377 if ($y0 < $y + $h && $y < $y1) { 2418 if ($y0 < $y + $h && $y < $y1) {
2378 $layout->set_foreground (@{ $par->[1] }); 2419 $layout->set_foreground (@{ $par->[2] });
2379 $layout->set_width ($self->{w} - $par->[2]); 2420 $layout->set_width ($W - $par->[3]);
2380 $layout->set_markup ($par->[3]); 2421 $layout->set_markup ($par->[4]);
2381 2422
2382 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2423 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2383 2424
2384 glRasterPos $par->[2], $y - $y0; 2425 glRasterPos $par->[3], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2386 } 2427 }
2387 2428
2388 $y += $h; 2429 $y += $h;
2389 } 2430 }
… …
2604} 2645}
2605 2646
2606sub _draw { 2647sub _draw {
2607 my ($self) = @_; 2648 my ($self) = @_;
2608 2649
2609 return unless $::CONN;#d# manage and cache textures differently 2650 return unless $::CONN;
2610 2651
2611 my $face; 2652 my $face;
2612 2653
2613 if ($self->{frame}) { 2654 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}]; 2655 my $anim = $::CONN->{anim}[$self->{anim}];
… …
3017} 3058}
3018 3059
3019sub size_allocate { 3060sub size_allocate {
3020 my ($self, $w, $h) = @_; 3061 my ($self, $w, $h) = @_;
3021 3062
3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3024
3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3026 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3027
3028 for my $child ($self->children) { 3063 for my $child ($self->children) {
3029 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)};
3030 3065
3031 $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
3032 if exists $child->{req_x}; 3067 if exists $child->{req_x};
… …
3061} 3096}
3062 3097
3063sub add { 3098sub add {
3064 my ($self, @children) = @_; 3099 my ($self, @children) = @_;
3065 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
3066 for my $child (@children) { 3107 for my $child (@children) {
3067 $child->{toplevel} = 1; 3108 $child->{is_toplevel} = 1;
3068 3109
3069 # integerise window positions 3110 # integerise window positions
3070 $child->{x} = int $child->{x}; 3111 $child->{x} = int $child->{x};
3071 $child->{y} = int $child->{y}; 3112 $child->{y} = int $child->{y};
3072 } 3113 }
3073 3114
3074 $self->SUPER::add (@children); 3115 $self->SUPER::add (@children);
3075
3076 while (@children) {
3077 my $w = pop @children;
3078 push @children, $w->children;
3079 $w->{visible} = 1;
3080 }
3081} 3116}
3082 3117
3083sub remove { 3118sub remove {
3084 my ($self, @children) = @_; 3119 my ($self, @children) = @_;
3085 3120

Diff Legend

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