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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

… …
794 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795} 795}
796 796
797############################################################################# 797#############################################################################
798 798
799# back-buffered drawing area
800
799package CFClient::UI::Window; 801package CFClient::UI::Window;
800 802
801our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
802 804
803use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
955package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
956 958
957our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
958 960
959sub new { 961sub new {
960 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
961 965
962 my $self; 966 my $self;
963 967
964 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
965 vertical => 1, 969 vertical => 1,
… …
970 ; 974 ;
971 975
972 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 978 slider => $slider,
975 @_, 979 %arg,
976 ); 980 );
977 981
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
981 984
982 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
983} 992}
984 993
985sub update { 994sub update {
986 my ($self) = @_; 995 my ($self) = @_;
987 996
… …
1151 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
1152 1161
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1164
1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1166 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1167 };
1159 1168
1160 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1166 1175
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1177
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1181 };
1171 } else { 1182 } else {
1172 return 0; 1183 return 0;
1173 } 1184 }
1174 1185
… …
1667 1678
1668 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1669 1680
1670 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1671 1682
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1684 $self->{text} = $text;
1676 1685
1677 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1679 1688
1680 $self->_emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1681} 1691}
1682 1692
1683sub set_text { 1693sub set_text {
1684 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1685 1695
… …
2335} 2345}
2336 2346
2337sub update { 2347sub update {
2338 my ($self) = @_; 2348 my ($self) = @_;
2339 2349
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2342 2359
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2361 my $range = ($hi - $page - $lo) || 1e-100;
2345 2362
… …
2351 $value = ($value - $lo) / $range; 2368 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2369 $value = $value * $self->{scale} + $self->{offset};
2353 2370
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2372 $self->{knob_w} = $knob_w;
2356 }); 2373 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2374
2364 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2365 2376
2366 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2367 2378
… …
3022 my $class = shift; 3033 my $class = shift;
3023 3034
3024 my $self = $class->SUPER::new ( 3035 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3036 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3027 @_, 3039 @_,
3028 ); 3040 );
3029 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3044
3032 $self 3045 $self
3033} 3046}
3034 3047
3035sub add { 3048sub add {
… …
3171 3184
3172sub new { 3185sub new {
3173 my $class = shift; 3186 my $class = shift;
3174 3187
3175 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3190 @_,
3178 ); 3191 );
3179 3192
3180 $self 3193 $self
3181} 3194}
3182 3195
3183sub set_items { 3196sub set_items {
3184 my ($self, $items) = @_; 3197 my ($self, $items) = @_;
3185 3198
3186 $self->{scrolled}->clear; 3199 $self->{child}->clear;
3187 return unless $items; 3200 return unless $items;
3188 3201
3189 my @items = sort { 3202 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3203 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3204 or ($a->{name} cmp $b->{name})
… …
3195 3208
3196 my $row = 0; 3209 my $row = 0;
3197 for my $item (@items) { 3210 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3211 CFClient::Item::update_widgets $item;
3199 3212
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3213 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3214 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3215 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3216
3204 $row++; 3217 $row++;
3205 } 3218 }
3206} 3219}
3207 3220
… …
3404 3417
3405############################################################################# 3418#############################################################################
3406 3419
3407package CFClient::UI::SpellList; 3420package CFClient::UI::SpellList;
3408 3421
3409our @ISA = CFClient::UI::ScrolledWindow::; 3422our @ISA = CFClient::UI::Table::;
3410 3423
3411sub new { 3424sub new {
3412 my $class = shift; 3425 my $class = shift;
3413 3426
3414 my $self = $class->SUPER::new ( 3427 my $self = $class->SUPER::new (
3415 binding => [], 3428 binding => [],
3416 commands => [], 3429 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3430 @_,
3419 ) 3431 )
3420} 3432}
3421 3433
3422# XXX: Do sorting? Argl... 3434# XXX: Do sorting? Argl...
3423sub add_spell { 3435sub add_spell {
3424 my ($self, $spell) = @_; 3436 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell; 3437 $self->{spells}->{$spell->{name}} = $spell;
3426 3438
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face}, 3440 face => $spell->{face},
3429 can_hover => 1, 3441 can_hover => 1,
3430 can_events => 1, 3442 can_events => 1,
3431 tooltip => $spell->{message}); 3443 tooltip => $spell->{message});
3432 3444
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name}, 3446 text => $spell->{name},
3435 can_hover => 1, 3447 can_hover => 1,
3436 can_events => 1, 3448 can_events => 1,
3437 tooltip => $spell->{message}, 3449 tooltip => $spell->{message},
3438 expand => 1); 3450 expand => 1);
3439 3451
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1); 3455 expand => 1);
3444 3456
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key", 3458 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448} 3460}
3449 3461
3450sub rebuild_spell_list { 3462sub rebuild_spell_list {

Diff Legend

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