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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

… …
219 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
220 } 220 }
221 } 221 }
222 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x}; 224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y}; 225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w}; 226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h}; 227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228 228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 231
232 $self->show if $layout->{show}; 232 $self->show if $layout->{show};
… …
355 $self->{x} = $x; 355 $self->{x} = $x;
356 $self->{y} = $y; 356 $self->{y} = $y;
357 $self->update; 357 $self->update;
358 } 358 }
359 359
360 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 361 return unless $self->{visible};
362 362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 366 $self->{root}{size_alloc}{$self+0} = $self;
364 } 367 }
365} 368}
366 369
367sub size_allocate { 370sub size_allocate {
368 # nothing to be done 371 # nothing to be done
… …
498 501
499sub realloc { 502sub realloc {
500 my ($self) = @_; 503 my ($self) = @_;
501 504
502 if ($self->{visible}) { 505 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 506 return if $self->{root}{realloc}{$self+0};
504 507
505 $self->{root}{realloc}{$self} = $self; 508 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 509 $self->{root}->update;
507 } else { 510 } else {
508 delete $self->{req_w}; 511 delete $self->{req_w};
512 delete $self->{req_h};
509 } 513 }
510} 514}
511 515
512sub update { 516sub update {
513 my ($self) = @_; 517 my ($self) = @_;
… …
546 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
547 glEnd; 551 glEnd;
548 glDisable GL_BLEND; 552 glDisable GL_BLEND;
549 } 553 }
550 554
551 if ($ENV{CFPLUS_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 556 glPushMatrix;
553 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
555 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
765sub size_request { 769sub size_request {
766 $_[0]{children}[0]->size_request 770 $_[0]{children}[0]->size_request
767} 771}
768 772
769sub size_allocate { 773sub size_allocate {
770 my ($self, $w, $h, $changed) = @_; 774 my ($self, $w, $h) = @_;
771 775
772 $self->{children}[0]->configure (0, 0, $w, $h); 776 $self->{children}[0]->configure (0, 0, $w, $h);
773} 777}
774 778
775############################################################################# 779#############################################################################
… …
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 797 $self->SUPER::update;
794} 798}
795 799
796sub size_allocate { 800sub size_allocate {
797 my ($self, $w, $h, $changed) = @_; 801 my ($self, $w, $h) = @_;
798 802
799 $self->SUPER::size_allocate ($w, $h, $changed); 803 $self->SUPER::size_allocate ($w, $h);
800 $self->update 804 $self->update;
801 if $changed;
802} 805}
803 806
804sub _render { 807sub _render {
805 $_[0]{children}[0]->draw; 808 $_[0]{children}[0]->draw;
806} 809}
… …
850} 853}
851 854
852sub size_request { 855sub size_request {
853 my ($self) = @_; 856 my ($self) = @_;
854 857
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 859
857 $w = 10 if $self->{scroll_x}; 860 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 861 $h = 10 if $self->{scroll_y};
859 862
860 ($w, $h) 863 ($w, $h)
861} 864}
862 865
863sub size_allocate { 866sub size_allocate {
864 my ($self, $w, $h, $changed) = @_; 867 my ($self, $w, $h) = @_;
865 868
869 my $child = $self->child;
870
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 873
869 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
870 $self->update; 875 $self->update;
871} 876}
872 877
… …
956 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 963}
959 964
960sub size_allocate { 965sub size_allocate {
961 my ($self, $w, $h, $changed) = @_; 966 my ($self, $w, $h) = @_;
962 967
963 $self->SUPER::size_allocate ($w, $h, $changed); 968 $self->SUPER::size_allocate ($w, $h);
964 969
965 my $child = $self->{vp}->child; 970 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967} 972}
968 973
… …
1061 $h + $self->border * 2, 1066 $h + $self->border * 2,
1062 ) 1067 )
1063} 1068}
1064 1069
1065sub size_allocate { 1070sub size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1071 my ($self, $w, $h) = @_;
1067
1068 return unless $changed;
1069 1072
1070 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
1072 1075
1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1245 (sum @$hs), 1248 (sum @$hs),
1246 ) 1249 )
1247} 1250}
1248 1251
1249sub size_allocate { 1252sub size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1253 my ($self, $w, $h) = @_;
1251 1254
1252 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1253 1256
1254 my $req_w = (sum @$ws) || 1; 1257 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1258 my $req_h = (sum @$hs) || 1;
… …
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1337 )
1335} 1338}
1336 1339
1337sub size_allocate { 1340sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1341 my ($self, $w, $h) = @_;
1339 1342
1340 my $space = $self->{vertical} ? $h : $w; 1343 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1344 my $children = $self->{children};
1342 1345
1343 my @req; 1346 my @req;
… …
1517 1520
1518 ($w, $h) 1521 ($w, $h)
1519} 1522}
1520 1523
1521sub size_allocate { 1524sub size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1525 my ($self, $w, $h) = @_;
1523 1526
1524 delete $self->{texture} 1527 delete $self->{texture}
1525 if $changed; 1528 ;#d#
1526} 1529}
1527 1530
1528sub set_fontsize { 1531sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1530 1533
… …
2382 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2386 $self->reflow;
2384} 2387}
2385 2388
2386sub size_allocate { 2389sub size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2390 my ($self, $w, $h) = @_;
2388 2391
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2392 $self->SUPER::size_allocate ($w, $h);
2390
2391 return unless $changed;
2392 2393
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2394 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2396 2397
… …
2619} 2620}
2620 2621
2621sub set_tooltip_from { 2622sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2623 2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2624 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2637 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2639 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2638 2648
2639 ($w + 4, $h + 4) 2649 ($w + 4, $h + 4)
2640} 2650}
2641 2651
2642sub size_allocate { 2652sub size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2653 my ($self, $w, $h) = @_;
2644 2654
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2648} 2656}
2649 2657
2650sub visibility_change { 2658sub visibility_change {
2651 my ($self, $visible) = @_; 2659 my ($self, $visible) = @_;
2652 2660
… …
2769 2777
2770 $self->{timer}->cancel 2778 $self->{timer}->cancel
2771 if $self->{timer}; 2779 if $self->{timer};
2772 2780
2773 $self->SUPER::DESTROY; 2781 $self->SUPER::DESTROY;
2774}
2775
2776#############################################################################
2777
2778package CFClient::UI::Inventory;
2779
2780our @ISA = CFClient::UI::ScrolledWindow::;
2781
2782sub new {
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816} 2782}
2817 2783
2818############################################################################# 2784#############################################################################
2819 2785
2820package CFClient::UI::Menu; 2786package CFClient::UI::Menu;
… …
2997 $self->SUPER::reconfigure; 2963 $self->SUPER::reconfigure;
2998} 2964}
2999 2965
3000############################################################################# 2966#############################################################################
3001 2967
2968package CFClient::UI::Inventory;
2969
2970our @ISA = CFClient::UI::ScrolledWindow::;
2971
2972sub new {
2973 my $class = shift;
2974
2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
3002package CFClient::UI::Root; 3259package CFClient::UI::Root;
3003 3260
3004our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
3005 3262
3006use CFClient::OpenGL; 3263use CFClient::OpenGL;
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3273 Scalar::Util::weaken ($self->{root} = $self);
3017 3274
3018 $self 3275 $self
3019} 3276}
3020 3277
3021sub configure {
3022 my ($self, $x, $y, $w, $h) = @_;
3023
3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request { 3278sub size_request {
3038 my ($self) = @_; 3279 my ($self) = @_;
3039 3280
3040 ($self->{w}, $self->{h}) 3281 ($self->{w}, $self->{h})
3041} 3282}
… …
3053 3294
3054 int $coord + 0.5 3295 int $coord + 0.5
3055} 3296}
3056 3297
3057sub size_allocate { 3298sub size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3299 my ($self, $w, $h) = @_;
3059 3300
3060 for my $child ($self->children) { 3301 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3303
3063 $X = $child->{force_x} if exists $child->{force_x}; 3304 $X = $child->{force_x} if exists $child->{force_x};
… …
3137 3378
3138 while () { 3379 while () {
3139 if ($self->{realloc}) { 3380 if ($self->{realloc}) {
3140 #TODO use array-of-depth approach 3381 #TODO use array-of-depth approach
3141 3382
3383 use sort 'stable';
3384
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}}; 3386 @queue, values %{delete $self->{realloc}};
3144 } 3387 }
3145 3388
3146 my $widget = pop @queue || last; 3389 my $widget = pop @queue || last;
… …
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154 3397
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3398 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3399 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3402 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3403 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3404 $widget->{req_h} = $h;
3160 3405
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3406 $self->{size_alloc}{$widget+0} = $widget;
3162 3407
3163 push @queue, $widget->{parent} 3408 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
3414 }
3415
3416 delete $self->{realloc}{$widget+0};
3165 } 3417 }
3166 } 3418 }
3167 3419
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3420 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3422 values %$size_alloc;
3171 3423
3172 while () { 3424 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3425 my $widget = pop @queue || last;
3174 3426
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3428
3178 $w = 0 if $w < 0; 3429 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3430 $h = 0 if $h < 0;
3180 3431
3181 $w = int $w + 0.5; 3432 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3433 $h = int $h + 0.5;
3183 3434
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3185
3186 $widget->{w} = $w; 3436 $widget->{w} = $w;
3187 $widget->{h} = $h; 3437 $widget->{h} = $h;
3188 3438
3189 $widget->emit (size_allocate => $w, $h, $changed); 3439 $widget->emit (size_allocate => $w, $h);
3440 }
3190 } 3441 }
3191 } 3442 }
3192 3443
3193 while ($self->{post_alloc_hook}) { 3444 while ($self->{post_alloc_hook}) {
3194 $_->() 3445 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 3446 for values %{delete $self->{post_alloc_hook}};
3196 } 3447 }
3448
3197 3449
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
3201 3453

Diff Legend

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