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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 2006 UTC

… …
9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %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}
19 38
20sub check_tooltip { 39sub check_tooltip {
21 if (!$GRAB) { 40 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 183 }
167 } 184 }
168 185
169 reconfigure_widgets; 186 reconfigure_widgets;
170} 187}
… …
187 can_events => 1, 204 can_events => 1,
188 @_ 205 @_
189 }, $class; 206 }, $class;
190 207
191 for (keys %$self) { 208 for (keys %$self) {
192 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
194 } 211 }
195 } 212 }
196 213
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
199 $self 223 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
200} 234}
201 235
202sub destroy { 236sub destroy {
203 my ($self) = @_; 237 my ($self) = @_;
204 238
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 259 },
226 ); 260 );
227} 261}
228 262
263sub set_visible {
264 my ($self) = @_;
265
266 return if $self->{visible};
267
268 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1;
270
271 $self->emit (visibility_change => 1)
272}
273
229sub set_invisible { 274sub set_invisible {
230 my ($self) = @_; 275 my ($self) = @_;
276
277 return unless $self->{visible};
231 278
232 # broken show/hide model 279 # broken show/hide model
233 280
234 delete $self->{root}; 281 delete $self->{root};
235 delete $self->{visible}; 282 delete $self->{visible};
… …
239 286
240 CFClient::UI::check_tooltip 287 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 288 if $CFClient::UI::TOOLTIP->{owner} == $self;
242 289
243 $self->focus_out; 290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
244} 293}
245 294
246sub hide { 295sub hide {
247 my ($self) = @_; 296 my ($self) = @_;
248 297
… …
263} 312}
264 313
265sub set_size { 314sub set_size {
266 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
267 316
268 $self->{user_w} = $w; 317 $self->{def_w} = $w;
269 $self->{user_h} = $h; 318 $self->{def_h} = $h;
270 319
271 $self->check_size; 320 $self->check_size;
272} 321}
273 322
274sub size_request { 323sub size_request {
… …
460sub set_parent { 509sub set_parent {
461 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
462 511
463 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
464 513
465 $self->{root} = $parent->{root}; 514 $self->set_visible;
466 $self->{visible} = $parent->{visible} + 1;
467 515
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size 516 $self->check_size;
470 unless exists $self->{req_w};
471
472 $self->show; 517 $self->show;
473} 518}
474 519
475sub check_size { 520sub check_size {
476 my ($self, $forced) = @_; 521 my ($self, $forced) = @_;
… …
501sub emit { 546sub emit {
502 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
503 548
504 $self->_emit ($signal, @args) 549 $self->_emit ($signal, @args)
505 || $self->$signal (@args); 550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
506} 555}
507 556
508sub DESTROY { 557sub DESTROY {
509 my ($self) = @_; 558 my ($self) = @_;
510 559
… …
858 my $class = shift; 907 my $class = shift;
859 908
860 my $self; 909 my $self;
861 910
862 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
863 vertical => 1, 912 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 914 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 915 $self->{vp}->set_offset (0, $_[1]);
867 }, 916 },
868 ; 917 ;
869 918
870 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
… …
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
956 1005
957sub new { 1006sub new {
958 my $class = shift; 1007 my $class = shift;
959
960 # TODO: user_x, user_y, overwrite moveto?
961 1008
962 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1010 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1011 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1012 border => 0.6,
… …
1025 my ($ev, $x, $y) = @_; 1072 my ($ev, $x, $y) = @_;
1026 1073
1027 my $dx = $ev->{x} - $ox; 1074 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1075 my $dy = $ev->{y} - $oy;
1029 1076
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1081 $self->move ($self->{user_x}, $self->{user_y});
1033 $self->check_size; 1082 $self->check_size;
1034 }; 1083 };
1035 1084
1036 } elsif ($lr ^ $td) { 1085 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1086 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1040 $self->{motion} = sub { 1089 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1090 my ($ev, $x, $y) = @_;
1042 1091
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1092 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1093
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1094 $self->{user_x} = $bx + $x - $ox;
1095 $self->{user_y} = $by + $y - $oy;
1096
1097 $self->move ($self->{user_x}, $self->{user_y});
1046 $self->update; 1098 $self->update;
1047 }; 1099 };
1048 } 1100 }
1049} 1101}
1050 1102
… …
1248 } 1300 }
1249} 1301}
1250 1302
1251############################################################################# 1303#############################################################################
1252 1304
1253package CFClient::UI::HBox; 1305package CFClient::UI::Box;
1254
1255# TODO: wrap into common Box base class
1256 1306
1257our @ISA = CFClient::UI::Container::; 1307our @ISA = CFClient::UI::Container::;
1258 1308
1259sub size_request { 1309sub size_request {
1260 my ($self) = @_; 1310 my ($self) = @_;
1261 1311
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1312 $self->{vertical}
1263 1313 ? (
1264 ( 1314 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1265 (List::Util::sum map $_->[0], @alloc), 1315 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266 (List::Util::max map $_->[1], @alloc), 1316 )
1267 ) 1317 : (
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 )
1268} 1321}
1269 1322
1270sub size_allocate { 1323sub size_allocate {
1271 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1272 1325
1273 ($h, $w) = ($w, $h); 1326 my $space = $self->{vertical} ? $h : $w;
1274
1275 my $children = $self->{children}; 1327 my $children = $self->{children};
1276 1328
1277 my @h = map $_->{req_w}, @$children; 1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1278
1279 my $req_h = List::Util::sum @h; 1330 my $req = List::Util::sum @req;
1280 1331
1281 if ($req_h > $h) { 1332 if ($req > $space) {
1282 # ah well, not enough space 1333 # ah well, not enough space
1283 $_ *= $h / $req_h for @h; 1334 $_ *= $space / $req for @req;
1284 } else { 1335 } else {
1285 my $exp = List::Util::sum map $_->{expand}, @$children; 1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286 $exp ||= 1;
1287 1337
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1288 for (0 .. $#$children) { 1339 for 0 .. $#$children;
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 }
1295 } 1340 }
1296 1341
1297 CFClient::UI::harmonize \@h; 1342 CFClient::UI::harmonize \@req;
1298 1343
1299 my $y = 0; 1344 my $pos = 0;
1300 for (0 .. $#$children) { 1345 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_]; 1346 my $alloc = $req[$_];
1303 $child->configure ($y, 0, $h, $w); 1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304 1348
1305 $y += $h; 1349 $pos += $alloc;
1306 } 1350 }
1307 1351
1308 1 1352 1
1309} 1353}
1310 1354
1311############################################################################# 1355#############################################################################
1312 1356
1357package CFClient::UI::HBox;
1358
1359our @ISA = CFClient::UI::Box::;
1360
1361sub new {
1362 my $class = shift;
1363
1364 $class->SUPER::new (
1365 vertical => 0,
1366 @_,
1367 )
1368}
1369
1370#############################################################################
1371
1313package CFClient::UI::VBox; 1372package CFClient::UI::VBox;
1314 1373
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1374our @ISA = CFClient::UI::Box::;
1318 1375
1319sub size_request { 1376sub new {
1320 my ($self) = @_; 1377 my $class = shift;
1321 1378
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1379 $class->SUPER::new (
1323 1380 vertical => 1,
1324 ( 1381 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1382 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1383}
1368 1384
1369############################################################################# 1385#############################################################################
1370 1386
1371package CFClient::UI::Label; 1387package CFClient::UI::Label;
… …
2544 2560
2545sub new { 2561sub new {
2546 my $class = shift; 2562 my $class = shift;
2547 2563
2548 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2549 state => 0, 2565 state => 0,
2550 connect_activate => \&toggle_flopper, 2566 on_activate => \&toggle_flopper,
2551 @_ 2567 @_
2552 ); 2568 );
2553 2569
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2570 $self
2560} 2571}
2561 2572
2562sub toggle_flopper { 2573sub toggle_flopper {
2563 my ($self) = @_; 2574 my ($self) = @_;
2564 2575
2565 # TODO: use animation 2576 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2577}
2577 2578
2578############################################################################# 2579#############################################################################
2579 2580
2580package CFClient::UI::Tooltip; 2581package CFClient::UI::Tooltip;
… …
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766 2767
2767 $row++; 2768 $row++;
2768 } 2769 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774} 2770}
2775 2771
2776############################################################################# 2772#############################################################################
2777 2773
2778package CFClient::UI::Menu; 2774package CFClient::UI::Menu;
… …
3002 if exists $child->{req_x}; 2998 if exists $child->{req_x};
3003 2999
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3005 if exists $child->{req_y}; 3001 if exists $child->{req_y};
3006 3002
3003 delete @$child{qw(req_x req_y)};
3004
3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009 3007
3010 $child->configure ($X, $Y, $W, $H); 3008 $child->configure ($X, $Y, $W, $H);
3011 } 3009 }
… …
3030 $::WANT_REFRESH++; 3028 $::WANT_REFRESH++;
3031} 3029}
3032 3030
3033sub add { 3031sub add {
3034 my ($self, @children) = @_; 3032 my ($self, @children) = @_;
3035
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041 3033
3042 for my $child (@children) { 3034 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3035 $child->{is_toplevel} = 1;
3044 3036
3045 # integerise window positions 3037 # integerise window positions
3046 $child->{x} = int $child->{x}; 3038 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y}; 3039 $child->{y} = int $child->{y};
3048 } 3040 }
3049 3041
3050 $self->SUPER::add (@children); 3042 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3051} 3049}
3052 3050
3053sub remove { 3051sub remove {
3054 my ($self, @children) = @_; 3052 my ($self, @children) = @_;
3055 3053
… …
3081 $_->() 3079 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3080 for values %{delete $self->{refresh_hook}};
3083 } 3081 }
3084 3082
3085 if ($self->{check_size}) { 3083 if ($self->{check_size}) {
3086 my @queue = ([], []); 3084 my @queue;
3087 3085
3088 for (;;) { 3086 for (;;) {
3089 if ($self->{check_size}) { 3087 if ($self->{check_size}) {
3090 # heuristic: check containers last 3088 #TODO use array-of-depth approach
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3089
3090 @queue = sort { $a->{visible} <=> $b->{visible} }
3092 for values %{delete $self->{check_size}} 3091 @queue, values %{delete $self->{check_size}};
3093 } 3092 }
3094 3093
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3094 my $widget = pop @queue || last;
3096 3095
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3098 ? @$widget{qw(user_w user_h)} 3099 ? @$widget{qw(def_w def_h)}
3099 : $widget->size_request; 3100 : $widget->size_request;
3100 3101
3101 if (delete $widget->{force_alloc} 3102 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#

Diff Legend

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