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.235 by root, Thu May 25 16:35:42 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
186 can_events => 1, 206 can_events => 1,
187 @_ 207 @_
188 }, $class; 208 }, $class;
189 209
190 for (keys %$self) { 210 for (keys %$self) {
191 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
193 } 213 }
194 } 214 }
195 215
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
198 $self 225 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
199} 236}
200 237
201sub destroy { 238sub destroy {
202 my ($self) = @_; 239 my ($self) = @_;
203 240
… …
226} 263}
227 264
228sub set_invisible { 265sub set_invisible {
229 my ($self) = @_; 266 my ($self) = @_;
230 267
268 return unless $self->{visible};
269
231 # broken show/hide model 270 # broken show/hide model
232 271
272 delete $self->{root};
233 delete $self->{visible}; 273 delete $self->{visible};
234 274
235 undef $GRAB if $GRAB == $self; 275 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 276 undef $HOVER if $HOVER == $self;
237 277
238 CFClient::UI::check_tooltip 278 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 279 if $CFClient::UI::TOOLTIP->{owner} == $self;
240 280
241 $self->focus_out; 281 $self->focus_out;
282
283 $self->emit (visibility_change => 0);
242} 284}
243 285
244sub hide { 286sub hide {
245 my ($self) = @_; 287 my ($self) = @_;
246 288
… …
458sub set_parent { 500sub set_parent {
459 my ($self, $parent) = @_; 501 my ($self, $parent) = @_;
460 502
461 Scalar::Util::weaken ($self->{parent} = $parent); 503 Scalar::Util::weaken ($self->{parent} = $parent);
462 504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
463 # TODO: req_w _does_change after ->reconfigure 513 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size 514 $self->check_size
465 unless exists $self->{req_w}; 515 unless exists $self->{req_w};
466 516
467 $self->show; 517 $self->show;
… …
496sub emit { 546sub emit {
497 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
498 548
499 $self->_emit ($signal, @args) 549 $self->_emit ($signal, @args)
500 || $self->$signal (@args); 550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
501} 555}
502 556
503sub DESTROY { 557sub DESTROY {
504 my ($self) = @_; 558 my ($self) = @_;
505 559
… …
618 delete $child->{parent}; 672 delete $child->{parent};
619 $child->hide; 673 $child->hide;
620 674
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 676
623 $self->check_size; 677 $self->check_size (1);
624 $self->update; 678 $self->update;
625} 679}
626 680
627sub clear { 681sub clear {
628 my ($self) = @_; 682 my ($self) = @_;
… …
853 my $class = shift; 907 my $class = shift;
854 908
855 my $self; 909 my $self;
856 910
857 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
858 vertical => 1, 912 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 914 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 915 $self->{vp}->set_offset (0, $_[1]);
862 }, 916 },
863 ; 917 ;
864 918
865 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
… …
871 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp}); 926 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
874 928
875 $self 929 $self
930}
931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 940}
877 941
878sub size_allocate { 942sub size_allocate {
879 my ($self, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
880 944
… …
1010 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
1011 1075
1012 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
1014 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
1018 $self->check_size; 1084 $self->check_size;
1019 }; 1085 };
1020 1086
1021 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1025 $self->{motion} = sub { 1091 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1027 1093
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1095
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098 $self->move ($self->{user_x}, $self->{user_y});
1031 $self->update; 1099 $self->update;
1032 }; 1100 };
1033 } 1101 }
1034} 1102}
1035 1103
… …
1101 col_expand => [], 1169 col_expand => [],
1102 @_, 1170 @_,
1103 ) 1171 )
1104} 1172}
1105 1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1176}
1177
1106sub add { 1178sub add {
1107 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1108 1180
1109 $child->set_parent ($self); 1181 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1111 1183
1112 $child->check_size; 1184 $self->check_size (1);
1113} 1185}
1114 1186
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal? 1187# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1188sub clear {
1121 my ($self) = @_; 1189 my ($self) = @_;
1122 1190
1123 my @children = $self->children; 1191 my @children = $self->children;
1124 delete $self->{children}; 1192 delete $self->{children};
… …
1126 for (@children) { 1194 for (@children) {
1127 delete $_->{parent}; 1195 delete $_->{parent};
1128 $_->hide; 1196 $_->hide;
1129 } 1197 }
1130 1198
1199 $self->check_size (1);
1131 $self->update; 1200 $self->update;
1132} 1201}
1133 1202
1134sub get_wh { 1203sub get_wh {
1135 my ($self) = @_; 1204 my ($self) = @_;
… …
1167sub size_allocate { 1236sub size_allocate {
1168 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1169 1238
1170 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1171 1240
1172 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1174 1243
1175 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
2132} 2201}
2133 2202
2134sub set_range { 2203sub set_range {
2135 my ($self, $range) = @_; 2204 my ($self, $range) = @_;
2136 2205
2137 $self->{range} = $range; 2206 ($range, $self->{range}) = ($self->{range}, $range);
2138 2207
2139 $self->update; 2208 $self->update
2209 if "@$range" ne "@{$self->{range}}";
2140} 2210}
2141 2211
2142sub set_value { 2212sub set_value {
2143 my ($self, $value) = @_; 2213 my ($self, $value) = @_;
2144 2214
… …
2527 2597
2528sub new { 2598sub new {
2529 my $class = shift; 2599 my $class = shift;
2530 2600
2531 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2532 state => 0, 2602 state => 0,
2533 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2534 @_ 2604 @_
2535 ); 2605 );
2536 2606
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2607 $self
2543} 2608}
2544 2609
2545sub toggle_flopper { 2610sub toggle_flopper {
2546 my ($self) = @_; 2611 my ($self) = @_;
2547 2612
2548 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2614}
2560 2615
2561############################################################################# 2616#############################################################################
2562 2617
2563package CFClient::UI::Tooltip; 2618package CFClient::UI::Tooltip;
… …
2747 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2748 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2749 2804
2750 $row++; 2805 $row++;
2751 } 2806 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754} 2807}
2755 2808
2756sub size_request { 2809sub size_request {
2757 my ($self) = @_; 2810 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h}); 2811 ($self->{req_w}, $self->{req_h});
… …
2950 3003
2951sub new { 3004sub new {
2952 my $class = shift; 3005 my $class = shift;
2953 3006
2954 $class->SUPER::new ( 3007 $class->SUPER::new (
3008 visible => 1,
2955 @_, 3009 @_,
2956 ) 3010 )
2957} 3011}
2958 3012
2959sub configure { 3013sub configure {
… …
2986 if exists $child->{req_x}; 3040 if exists $child->{req_x};
2987 3041
2988 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2989 if exists $child->{req_y}; 3043 if exists $child->{req_y};
2990 3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
2991 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2992 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2993 3050
2994 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
2995 } 3052 }
… …
3017sub add { 3074sub add {
3018 my ($self, @children) = @_; 3075 my ($self, @children) = @_;
3019 3076
3020 for (my @widgets = @children; my $w = pop @widgets; ) { 3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3021 push @widgets, $w->children; 3078 push @widgets, $w->children;
3022 $w->{root} = $self; 3079 $w->{root} = $self;
3023 $w->{visible} = 1; 3080 $w->{visible} = $self->{visible} + 1;
3024 } 3081 }
3025 3082
3026 for my $child (@children) { 3083 for my $child (@children) {
3027 $child->{is_toplevel} = 1; 3084 $child->{is_toplevel} = 1;
3028 3085
… …
3065 $_->() 3122 $_->()
3066 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3067 } 3124 }
3068 3125
3069 if ($self->{check_size}) { 3126 if ($self->{check_size}) {
3070 my @queue = ([], []); 3127 my @queue;
3071 3128
3072 for (;;) { 3129 for (;;) {
3073 if ($self->{check_size}) { 3130 if ($self->{check_size}) {
3074 # heuristic: check containers last 3131 #TODO use array-of-depth approach
3075 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3133 @queue = sort { $a->{visible} <=> $b->{visible} }
3076 for values %{delete $self->{check_size}} 3134 @queue, values %{delete $self->{check_size}};
3077 } 3135 }
3078 3136
3079 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3137 my $widget = pop @queue || last;
3138
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3080 3140
3081 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3082 ? @$widget{qw(user_w user_h)} 3142 ? @$widget{qw(user_w user_h)}
3083 : $widget->size_request; 3143 : $widget->size_request;
3084 3144

Diff Legend

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