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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.247 by root, Sun May 28 01:16:04 2006 UTC

… …
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $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};
178 $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};
179 $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};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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};
182 $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};
183 $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};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
185 } 183 }
186 } 184 }
187 185
188 reconfigure_widgets; 186 reconfigure_widgets;
189} 187}
… …
214 } 212 }
215 213
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217 215
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 217 $self->{req_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 218 $self->{req_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 } 221 }
224 222
225 $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 }
226} 234}
227 235
228sub destroy { 236sub destroy {
229 my ($self) = @_; 237 my ($self) = @_;
230 238
… …
237 return if $self->{parent}; 245 return if $self->{parent};
238 246
239 $CFClient::UI::ROOT->add ($self); 247 $CFClient::UI::ROOT->add ($self);
240} 248}
241 249
242sub show_centered { 250sub center {
243 my ($self) = @_; 251 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247 252
248 $CFClient::UI::ROOT->on_post_alloc ( 253 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub { 254 "center_$self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 }, 256 },
252 ); 257 );
258
259 $self->update;
260}
261
262sub set_visible {
263 my ($self) = @_;
264
265 return if $self->{visible};
266
267 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1;
269
270 $self->emit (visibility_change => 1)
253} 271}
254 272
255sub set_invisible { 273sub set_invisible {
256 my ($self) = @_; 274 my ($self) = @_;
275
276 return unless $self->{visible};
257 277
258 # broken show/hide model 278 # broken show/hide model
259 279
260 delete $self->{root}; 280 delete $self->{root};
261 delete $self->{visible}; 281 delete $self->{visible};
… …
265 285
266 CFClient::UI::check_tooltip 286 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 287 if $CFClient::UI::TOOLTIP->{owner} == $self;
268 288
269 $self->focus_out; 289 $self->focus_out;
290
291 $self->emit (visibility_change => 0);
270} 292}
271 293
272sub hide { 294sub hide {
273 my ($self) = @_; 295 my ($self) = @_;
274 296
… …
289} 311}
290 312
291sub set_size { 313sub set_size {
292 my ($self, $w, $h) = @_; 314 my ($self, $w, $h) = @_;
293 315
294 $self->{user_w} = $w; 316 $self->{def_w} = $w;
295 $self->{user_h} = $h; 317 $self->{def_h} = $h;
296 318
297 $self->check_size; 319 $self->check_size;
298} 320}
299 321
300sub size_request { 322sub size_request {
… …
486sub set_parent { 508sub set_parent {
487 my ($self, $parent) = @_; 509 my ($self, $parent) = @_;
488 510
489 Scalar::Util::weaken ($self->{parent} = $parent); 511 Scalar::Util::weaken ($self->{parent} = $parent);
490 512
491 $self->{root} = $parent->{root}; 513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
492 $self->{visible} = $parent->{visible} + 1;
493 514
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size 515 $self->check_size;
496 unless exists $self->{req_w};
497
498 $self->show;
499} 516}
500 517
501sub check_size { 518sub check_size {
502 my ($self, $forced) = @_; 519 my ($self, $forced) = @_;
503 520
… …
527sub emit { 544sub emit {
528 my ($self, $signal, @args) = @_; 545 my ($self, $signal, @args) = @_;
529 546
530 $self->_emit ($signal, @args) 547 $self->_emit ($signal, @args)
531 || $self->$signal (@args); 548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
532} 553}
533 554
534sub DESTROY { 555sub DESTROY {
535 my ($self) = @_; 556 my ($self) = @_;
536 557
… …
812} 833}
813 834
814sub size_request { 835sub size_request {
815 my ($self) = @_; 836 my ($self) = @_;
816 837
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
818 839
819 @$self{qw(child_w child_h)} 840 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y};
842
843 ($w, $h)
820} 844}
821 845
822sub size_allocate { 846sub size_allocate {
823 my ($self, $w, $h) = @_; 847 my ($self, $w, $h) = @_;
824 848
… …
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1005 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1006
983sub new { 1007sub new {
984 my $class = shift; 1008 my $class = shift;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1009
988 my $self = $class->SUPER::new ( 1010 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1011 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1012 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1013 border => 0.6,
… …
1053 my $dx = $ev->{x} - $ox; 1075 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1076 my $dy = $ev->{y} - $oy;
1055 1077
1056 $self->{user_x} = $wx + $dx * $mx; 1078 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my; 1079 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1082 $self->move ($self->{user_x}, $self->{user_y});
1061 $self->check_size; 1083 $self->check_size;
1062 }; 1084 };
1063 1085
1064 } elsif ($lr ^ $td) { 1086 } elsif ($lr ^ $td) {
… …
1070 1092
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1093 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1094
1073 $self->{user_x} = $bx + $x - $ox; 1095 $self->{user_x} = $bx + $x - $ox;
1074 $self->{user_y} = $by + $y - $oy; 1096 $self->{user_y} = $by + $y - $oy;
1097
1075 $self->move ($self->{user_x}, $self->{user_y}); 1098 $self->move ($self->{user_x}, $self->{user_y});
1076 $self->update; 1099 $self->update;
1077 }; 1100 };
1078 } 1101 }
1079} 1102}
… …
1278 } 1301 }
1279} 1302}
1280 1303
1281############################################################################# 1304#############################################################################
1282 1305
1283package CFClient::UI::HBox; 1306package CFClient::UI::Box;
1284
1285# TODO: wrap into common Box base class
1286 1307
1287our @ISA = CFClient::UI::Container::; 1308our @ISA = CFClient::UI::Container::;
1288 1309
1289sub size_request { 1310sub size_request {
1290 my ($self) = @_; 1311 my ($self) = @_;
1291 1312
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1313 $self->{vertical}
1293 1314 ? (
1294 ( 1315 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1295 (List::Util::sum map $_->[0], @alloc), 1316 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296 (List::Util::max map $_->[1], @alloc), 1317 )
1297 ) 1318 : (
1319 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1320 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1321 )
1298} 1322}
1299 1323
1300sub size_allocate { 1324sub size_allocate {
1301 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1302 1326
1303 ($h, $w) = ($w, $h); 1327 my $space = $self->{vertical} ? $h : $w;
1304
1305 my $children = $self->{children}; 1328 my $children = $self->{children};
1306 1329
1307 my @h = map $_->{req_w}, @$children; 1330 my @req;
1308 1331
1309 my $req_h = List::Util::sum @h; 1332 if ($self->{homogeneous}) {
1310 1333 @req = ($space / (@$children || 1)) x @$children;
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } else { 1334 } else {
1335 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1336 my $req = List::Util::sum @req;
1337
1338 if ($req > $space) {
1339 # ah well, not enough space
1340 $_ *= $space / $req for @req;
1341 } else {
1315 my $exp = List::Util::sum map $_->{expand}, @$children; 1342 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316 $exp ||= 1;
1317 1343
1344 $space = ($space - $req) / $expand; # remaining space to give away
1345
1346 $req[$_] += $space * $children->[$_]{expand}
1318 for (0 .. $#$children) { 1347 for 0 .. $#$children;
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 } 1348 }
1325 } 1349 }
1326 1350
1327 CFClient::UI::harmonize \@h; 1351 CFClient::UI::harmonize \@req;
1328 1352
1329 my $y = 0; 1353 my $pos = 0;
1330 for (0 .. $#$children) { 1354 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_]; 1355 my $alloc = $req[$_];
1333 $child->configure ($y, 0, $h, $w); 1356 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334 1357
1335 $y += $h; 1358 $pos += $alloc;
1336 } 1359 }
1337 1360
1338 1 1361 1
1339} 1362}
1340 1363
1341############################################################################# 1364#############################################################################
1342 1365
1366package CFClient::UI::HBox;
1367
1368our @ISA = CFClient::UI::Box::;
1369
1370sub new {
1371 my $class = shift;
1372
1373 $class->SUPER::new (
1374 vertical => 0,
1375 @_,
1376 )
1377}
1378
1379#############################################################################
1380
1343package CFClient::UI::VBox; 1381package CFClient::UI::VBox;
1344 1382
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Box::;
1348 1384
1349sub size_request { 1385sub new {
1350 my ($self) = @_; 1386 my $class = shift;
1351 1387
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $class->SUPER::new (
1353 1389 vertical => 1,
1354 ( 1390 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1391 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1392}
1398 1393
1399############################################################################# 1394#############################################################################
1400 1395
1401package CFClient::UI::Label; 1396package CFClient::UI::Label;
… …
2579 state => 0, 2574 state => 0,
2580 on_activate => \&toggle_flopper, 2575 on_activate => \&toggle_flopper,
2581 @_ 2576 @_
2582 ); 2577 );
2583 2578
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2579 $self
2590} 2580}
2591 2581
2592sub toggle_flopper { 2582sub toggle_flopper {
2593 my ($self) = @_; 2583 my ($self) = @_;
2594 2584
2595 # TODO: use animation 2585 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2586}
2607 2587
2608############################################################################# 2588#############################################################################
2609 2589
2610package CFClient::UI::Tooltip; 2590package CFClient::UI::Tooltip;
… …
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796 2776
2797 $row++; 2777 $row++;
2798 } 2778 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804} 2779}
2805 2780
2806############################################################################# 2781#############################################################################
2807 2782
2808package CFClient::UI::Menu; 2783package CFClient::UI::Menu;
… …
3032 if exists $child->{req_x}; 3007 if exists $child->{req_x};
3033 3008
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y}; 3010 if exists $child->{req_y};
3036 3011
3012 delete @$child{qw(req_x req_y)};
3013
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3016
3040 $child->configure ($X, $Y, $W, $H); 3017 $child->configure ($X, $Y, $W, $H);
3041 } 3018 }
… …
3060 $::WANT_REFRESH++; 3037 $::WANT_REFRESH++;
3061} 3038}
3062 3039
3063sub add { 3040sub add {
3064 my ($self, @children) = @_; 3041 my ($self, @children) = @_;
3065
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071 3042
3072 for my $child (@children) { 3043 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3044 $child->{is_toplevel} = 1;
3074 3045
3075 # integerise window positions 3046 # integerise window positions
3076 $child->{x} = int $child->{x}; 3047 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y}; 3048 $child->{y} = int $child->{y};
3078 } 3049 }
3079 3050
3080 $self->SUPER::add (@children); 3051 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3081} 3058}
3082 3059
3083sub remove { 3060sub remove {
3084 my ($self, @children) = @_; 3061 my ($self, @children) = @_;
3085 3062
… …
3125 3102
3126 my $widget = pop @queue || last; 3103 my $widget = pop @queue || last;
3127 3104
3128 defined $widget->{visible} or last; # do not resize invisible widgets 3105 defined $widget->{visible} or last; # do not resize invisible widgets
3129 3106
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3131 ? @$widget{qw(user_w user_h)} 3108 ? @$widget{qw(def_w def_h)}
3132 : $widget->size_request; 3109 : $widget->size_request;
3133 3110
3134 if (delete $widget->{force_alloc} 3111 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#

Diff Legend

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