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.219 by root, Sun May 21 00:34:59 2006 UTC vs.
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC

… …
134 for (@$vals) { 134 for (@$vals) {
135 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
136 $rem += $_ - $i; 136 $rem += $_ - $i;
137 $_ = $i; 137 $_ = $i;
138 } 138 }
139}
140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
139} 147}
140 148
141# call when resolution changes etc. 149# call when resolution changes etc.
142sub rescale_widgets { 150sub rescale_widgets {
143 my ($sx, $sy) = @_; 151 my ($sx, $sy) = @_;
… …
198 %$self = (); 206 %$self = ();
199} 207}
200 208
201sub show { 209sub show {
202 my ($self) = @_; 210 my ($self) = @_;
203
204 return if $self->{parent}; 211 return if $self->{parent};
205 212
206 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
207} 227}
208 228
209sub hide { 229sub hide {
210 my ($self) = @_; 230 my ($self) = @_;
211 231
… …
419 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
420 440
421 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 442 $self->check_size
423 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
424} 446}
425 447
426sub check_size { 448sub check_size {
427 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
428 450
… …
721 743
722sub size_request { 744sub size_request {
723 my ($self) = @_; 745 my ($self) = @_;
724 746
725 @$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)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 748
728 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
729} 750}
730 751
731sub size_allocate { 752sub size_allocate {
732 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
733 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
734 $self->update; 758 $self->update;
735} 759}
736 760
737sub set_offset { 761sub set_offset {
738 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
1466 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1467 can_hover => 1, 1491 can_hover => 1,
1468 can_focus => 1, 1492 can_focus => 1,
1469 valign => 0, 1493 valign => 0,
1470 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1471 @_ 1496 @_
1472 ) 1497 )
1473} 1498}
1474 1499
1475sub _set_text { 1500sub _set_text {
… …
2060 $self->update; 2085 $self->update;
2061 2086
2062 $self 2087 $self
2063} 2088}
2064 2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2065sub set_value { 2098sub set_value {
2066 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2067 2100
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2102
… …
2168 # draw handle 2201 # draw handle
2169 $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);
2170 2203
2171 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2172} 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 (@_) }
2173 2247
2174############################################################################# 2248#############################################################################
2175 2249
2176package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2177 2251
… …
2207 2281
2208 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2283 $self->reflow;
2210} 2284}
2211 2285
2286sub size_allocate {
2287 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290
2291 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294
2295 $self->reflow;
2296}
2297
2212sub text_height { 2298sub text_height {
2213 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2214 2300
2215 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2216 2302
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2219 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2220 2306
2221 ($layout->size)[1] 2307 ($layout->size)[1]
2222} 2308}
2223 2309
… …
2226 2312
2227 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2228 $self->update; 2314 $self->update;
2229} 2315}
2230 2316
2231sub size_allocate {
2232 my ($self, $w, $h) = @_;
2233
2234 $self->SUPER::size_allocate ($w, $h);
2235
2236 $self->{layout}->set_font ($self->{font}) if $self->{font};
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $self->{layout}->set_width ($self->{children}[0]{w});
2239
2240 $self->reflow;
2241}
2242
2243sub add_paragraph { 2317sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2318 my ($self, $color, $text, $indent) = @_;
2245 2319
2246 #TODO: intelligently "reformat" paragraph 2320 #TODO: intelligently "reformat" paragraph
2247 2321
2322 for my $line (split /\n/, $text) {
2248 my $height = $self->text_height ($text); 2323 my $height = $self->text_height ($line);
2249
2250 $self->{height} += $height; 2324 $self->{height} += $height;
2251
2252 push @{$self->{par}}, [$height, $color, $text]; 2325 push @{$self->{par}}, [$height, $color, $indent, $line];
2326 }
2253 2327
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2255 $self->{children}[1]->update; 2329 $self->{children}[1]->update;
2256} 2330}
2257 2331
… …
2266 2340
2267 $ROOT->on_post_alloc ($self, sub { 2341 $ROOT->on_post_alloc ($self, sub {
2268 if (delete $self->{need_reflow}) { 2342 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2343 my $height = 0;
2270 2344
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2272 for @{$self->{par}}; 2346 for @{$self->{par}};
2273 2347
2274 $self->{height} = $height; 2348 $self->{height} = $height;
2275 2349
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2351 $self->{children}[1]->update;
2277 2352
2278 delete $self->{texture}; 2353 delete $self->{texture};
2279 } 2354 }
2280 2355
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2357 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2358 glClear GL_COLOR_BUFFER_BIT;
2284 2359
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2360 my $top = int $self->{children}[1]{range}[0];
2289 2361
2290 my $y0 = $top; 2362 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2363 my $y1 = $top + $self->{h};
2292 2364
… …
2294 2366
2295 my $layout = $self->{layout}; 2367 my $layout = $self->{layout};
2296 2368
2297 $layout->set_font ($self->{font}) if $self->{font}; 2369 $layout->set_font ($self->{font}) if $self->{font};
2298 2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2299 for my $par (@{$self->{par}}) { 2374 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2375 my $h = $par->[0];
2301 2376
2302 if ($y0 < $y + $h && $y < $y1) { 2377 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2304 $layout->set_markup ($par->[2]); 2380 $layout->set_markup ($par->[3]);
2305 2381
2306 my ($W, $H) = $layout->size; 2382 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2383
2384 glRasterPos $par->[2], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2386 }
2309 2387
2310 $y += $h; 2388 $y += $h;
2311 } 2389 }
2312 2390
2313 glDisable GL_TEXTURE_2D; 2391 glDisable GL_BLEND;
2314 }; 2392 };
2315 }); 2393 });
2316} 2394}
2317 2395
2318sub _draw { 2396sub _draw {
… …
2515 2593
2516sub size_request { 2594sub size_request {
2517 (32, 8) 2595 (32, 8)
2518} 2596}
2519 2597
2598sub update {
2599 my ($self) = @_;
2600
2601 return unless $self->{visible};
2602
2603 $self->SUPER::update;
2604}
2605
2520sub _draw { 2606sub _draw {
2521 my ($self) = @_; 2607 my ($self) = @_;
2522 2608
2523 return unless $::CONN;#d# manage and cache textures differently 2609 return unless $::CONN;#d# manage and cache textures differently
2524 2610
… …
2594 2680
2595 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2596 can_hover => 1, 2682 can_hover => 1,
2597 can_events => 1, 2683 can_events => 1,
2598 tooltip => ((CFClient::UI::Label::escape $desc) 2684 tooltip => ((CFClient::UI::Label::escape $desc)
2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2600 connect_button_down => sub { 2686 connect_button_down => sub {
2601 my ($self, $ev, $x, $y) = @_; 2687 my ($self, $ev, $x, $y) = @_;
2602 2688
2603 # todo: maybe put examine on 1? but should just be a tooltip :( 2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2604 if ($ev->{button} == 1) { 2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag}; 2691 my $targ = $::CONN->{player}{tag};
2606 2692
2607 if ($item->{container} == $::CONN->{player}{tag}) { 2693 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT; 2694 $targ = $main::OPENCONT;
2609 } 2695 }
2610 2696
2611 $::CONN->send ("move $targ $item->{tag} 0"); 2697 $::CONN->send ("move $targ $item->{tag} 0");
2698 } elsif ($ev->{button} == 1) {
2699 $::CONN->send ("examine $item->{tag}");
2612 } elsif ($ev->{button} == 2) { 2700 } elsif ($ev->{button} == 2) {
2613 $::CONN->send ("apply $item->{tag}"); 2701 $::CONN->send ("apply $item->{tag}");
2614 } elsif ($ev->{button} == 3) { 2702 } elsif ($ev->{button} == 3) {
2615 my @menu_items = ( 2703 my @menu_items = (
2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
… …
2669 2757
2670sub new { 2758sub new {
2671 my $class = shift; 2759 my $class = shift;
2672 2760
2673 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2674 scrolled => (new CFClient::UI::VBox), 2762 scrolled => (new CFClient::UI::Table),
2675 @_, 2763 @_,
2676 ); 2764 );
2677 2765
2678 $self 2766 $self
2679} 2767}
… …
2690 } @$items; 2778 } @$items;
2691 2779
2692 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2693 2781
2694 for my $item (@items) { 2782 for my $item (@items) {
2783 $item->{item} = $item;
2695 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2696 $item->update_item (); 2785 $item->update_item ();
2697 } 2786 }
2698 2787
2788 my $i = 0;
2789 for (@items) {
2699 $self->{scrolled}->add (@items); 2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2793 }
2700 2794
2701# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2702} 2796}
2703 2797
2704sub size_request { 2798sub size_request {
… …
2976 $child->{x} = int $child->{x}; 3070 $child->{x} = int $child->{x};
2977 $child->{y} = int $child->{y}; 3071 $child->{y} = int $child->{y};
2978 } 3072 }
2979 3073
2980 $self->SUPER::add (@children); 3074 $self->SUPER::add (@children);
3075
3076 while (@children) {
3077 my $w = pop @children;
3078 push @children, $w->children;
3079 $w->{visible} = 1;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 }
2981} 3093}
2982 3094
2983sub on_refresh { 3095sub on_refresh {
2984 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2985 3097

Diff Legend

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