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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.226 by root, Tue May 23 23:14:46 2006 UTC

… …
206 %$self = (); 206 %$self = ();
207} 207}
208 208
209sub show { 209sub show {
210 my ($self) = @_; 210 my ($self) = @_;
211
212 return if $self->{parent}; 211 return if $self->{parent};
213 212
214 $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 );
215} 227}
216 228
217sub hide { 229sub hide {
218 my ($self) = @_; 230 my ($self) = @_;
219 231
… …
427 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
428 440
429 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size 442 $self->check_size
431 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
432} 446}
433 447
434sub check_size { 448sub check_size {
435 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
436 450
… …
729 743
730sub size_request { 744sub size_request {
731 my ($self) = @_; 745 my ($self) = @_;
732 746
733 @$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)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 748
736 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
737} 750}
738 751
739sub size_allocate { 752sub size_allocate {
740 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
741 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
742 $self->update; 758 $self->update;
743} 759}
744 760
745sub set_offset { 761sub set_offset {
746 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
1474 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1475 can_hover => 1, 1491 can_hover => 1,
1476 can_focus => 1, 1492 can_focus => 1,
1477 valign => 0, 1493 valign => 0,
1478 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1479 @_ 1496 @_
1480 ) 1497 )
1481} 1498}
1482 1499
1483sub _set_text { 1500sub _set_text {
… …
2068 $self->update; 2085 $self->update;
2069 2086
2070 $self 2087 $self
2071} 2088}
2072 2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2073sub set_value { 2098sub set_value {
2074 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2075 2100
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2102
… …
2176 # draw handle 2201 # draw handle
2177 $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);
2178 2203
2179 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2180} 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 (@_) }
2181 2247
2182############################################################################# 2248#############################################################################
2183 2249
2184package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2185 2251
… …
2246 2312
2247 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2248 $self->update; 2314 $self->update;
2249} 2315}
2250 2316
2317sub clear {
2318 my ($self) = @_;
2319
2320 $self->{par} = [];
2321 $self->{height} = 0;
2322
2323 $self->reflow;
2324}
2325
2251sub add_paragraph { 2326sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2327 my ($self, $color, $text, $indent) = @_;
2253
2254 #TODO: intelligently "reformat" paragraph
2255 2328
2256 for my $line (split /\n/, $text) { 2329 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2330 my $height = $self->text_height ($line);
2258 $self->{height} += $height; 2331 $self->{height} += $height;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2332 push @{$self->{par}}, [$height, $color, $indent, $line];
… …
2527 2600
2528sub size_request { 2601sub size_request {
2529 (32, 8) 2602 (32, 8)
2530} 2603}
2531 2604
2605sub update {
2606 my ($self) = @_;
2607
2608 return unless $self->{visible};
2609
2610 $self->SUPER::update;
2611}
2612
2532sub _draw { 2613sub _draw {
2533 my ($self) = @_; 2614 my ($self) = @_;
2534 2615
2535 return unless $::CONN;#d# manage and cache textures differently 2616 return unless $::CONN;#d# manage and cache textures differently
2536 2617
… …
2606 2687
2607 my $self = $class->SUPER::new ( 2688 my $self = $class->SUPER::new (
2608 can_hover => 1, 2689 can_hover => 1,
2609 can_events => 1, 2690 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc) 2691 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub { 2693 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_; 2694 my ($self, $ev, $x, $y) = @_;
2614 2695
2615 # todo: maybe put examine on 1? but should just be a tooltip :( 2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) { 2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag}; 2698 my $targ = $::CONN->{player}{tag};
2618 2699
2619 if ($item->{container} == $::CONN->{player}{tag}) { 2700 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT; 2701 $targ = $main::OPENCONT;
2621 } 2702 }
2622 2703
2623 $::CONN->send ("move $targ $item->{tag} 0"); 2704 $::CONN->send ("move $targ $item->{tag} 0");
2705 } elsif ($ev->{button} == 1) {
2706 $::CONN->send ("examine $item->{tag}");
2624 } elsif ($ev->{button} == 2) { 2707 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}"); 2708 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) { 2709 } elsif ($ev->{button} == 3) {
2627 my @menu_items = ( 2710 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
… …
2681 2764
2682sub new { 2765sub new {
2683 my $class = shift; 2766 my $class = shift;
2684 2767
2685 my $self = $class->SUPER::new ( 2768 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox), 2769 scrolled => (new CFClient::UI::Table),
2687 @_, 2770 @_,
2688 ); 2771 );
2689 2772
2690 $self 2773 $self
2691} 2774}
… …
2702 } @$items; 2785 } @$items;
2703 2786
2704 $self->{real_items} = \@items; 2787 $self->{real_items} = \@items;
2705 2788
2706 for my $item (@items) { 2789 for my $item (@items) {
2790 $item->{item} = $item;
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item (); 2792 $item->update_item ();
2709 } 2793 }
2710 2794
2795 my $i = 0;
2796 for (@items) {
2711 $self->{scrolled}->add (@items); 2797 $self->{scrolled}->add (0, $i, $_);
2798 my $nrof = $_->{item}->{nrof} || 1;
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800 }
2712 2801
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714} 2803}
2715 2804
2716sub size_request { 2805sub size_request {
… …
2988 $child->{x} = int $child->{x}; 3077 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y}; 3078 $child->{y} = int $child->{y};
2990 } 3079 }
2991 3080
2992 $self->SUPER::add (@children); 3081 $self->SUPER::add (@children);
3082
3083 while (@children) {
3084 my $w = pop @children;
3085 push @children, $w->children;
3086 $w->{visible} = 1;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 }
2993} 3100}
2994 3101
2995sub on_refresh { 3102sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3103 my ($self, $id, $cb) = @_;
2997 3104

Diff Legend

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