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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 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}) {
… …
36 55
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH; 57 if $x + $TOOLTIP->{w} > $::WIDTH;
39 58
40 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update; 60 $TOOLTIP->realloc;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
… …
156 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 176 $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}; 177 $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}; 178 $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}; 179 $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}; 180 $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}; 181 $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 } 182 }
167 } 183 }
168 184
169 reconfigure_widgets; 185 reconfigure_widgets;
170} 186}
… …
187 can_events => 1, 203 can_events => 1,
188 @_ 204 @_
189 }, $class; 205 }, $class;
190 206
191 for (keys %$self) { 207 for (keys %$self) {
192 if (/^connect_(.*)$/) { 208 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 209 $self->connect ($1 => delete $self->{$_});
194 } 210 }
195 } 211 }
196 212
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH;
217 $self->{req_y} = $layout->{y} * $::HEIGHT;
218 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
219 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
220 }
221
199 $self 222 $self
200} 223}
201 224
202sub destroy { 225sub destroy {
203 my ($self) = @_; 226 my ($self) = @_;
… …
206 %$self = (); 229 %$self = ();
207} 230}
208 231
209sub show { 232sub show {
210 my ($self) = @_; 233 my ($self) = @_;
234
211 return if $self->{parent}; 235 return if $self->{parent};
212 236
213 $CFClient::UI::ROOT->add ($self); 237 $CFClient::UI::ROOT->add ($self);
214} 238}
215 239
216sub show_centered { 240sub center {
217 my ($self) = @_; 241 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221 242
222 $CFClient::UI::ROOT->on_post_alloc ( 243 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub { 244 "center_$self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
225 }, 246 },
226 ); 247 );
248
249 $self->update;
250}
251
252sub set_visible {
253 my ($self) = @_;
254
255 return if $self->{visible};
256
257 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1;
259
260 $self->emit (visibility_change => 1);
261
262 $self->realloc unless exists $self->{req_w};
263
264 $_->set_visible for $self->children;
227} 265}
228 266
229sub set_invisible { 267sub set_invisible {
230 my ($self) = @_; 268 my ($self) = @_;
231 269
232 # broken show/hide model 270 return unless $self->{visible};
233 271
272 $_->set_invisible for $self->children;
273
274 delete $self->{root};
234 delete $self->{visible}; 275 delete $self->{visible};
235 276
236 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 278 undef $HOVER if $HOVER == $self;
238 279
239 CFClient::UI::check_tooltip 280 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 281 if $TOOLTIP->{owner} == $self;
241 282
242 $self->focus_out; 283 $self->focus_out;
284
285 $self->emit (visibility_change => 0);
286}
287
288sub set_visibility {
289 my ($self, $visible) = @_;
290
291 return if $self->{visible} == $visible;
292
293 $visible ? $self->hide
294 : $self->show;
295}
296
297sub toggle_visibility {
298 my ($self) = @_;
299
300 $self->{visible}
301 ? $self->hide
302 : $self->show;
243} 303}
244 304
245sub hide { 305sub hide {
246 my ($self) = @_; 306 my ($self) = @_;
247 307
… …
262} 322}
263 323
264sub set_size { 324sub set_size {
265 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
266 326
267 $self->{user_w} = $w; 327 $self->{def_w} = $w;
268 $self->{user_h} = $h; 328 $self->{def_h} = $h;
269 329
270 $self->check_size; 330 $self->realloc;
271} 331}
272 332
273sub size_request { 333sub size_request {
274 require Carp; 334 require Carp;
275 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
295 $self->{y} = $y; 355 $self->{y} = $y;
296 $self->update; 356 $self->update;
297 } 357 }
298 358
299 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
301 } 363 }
302} 364}
303 365
304sub size_allocate { 366sub size_allocate {
305 # nothing to be done 367 # nothing to be done
306}
307
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313} 368}
314 369
315sub children { 370sub children {
316} 371}
317 372
… …
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
399sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455
456sub find_widget {
457 my ($self, $x, $y) = @_;
458
459 return () unless $self->{can_events};
460
461 return $self
462 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
463 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
464
465 ()
466}
467
468sub set_parent {
469 my ($self, $parent) = @_;
470
471 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499}
500
501sub realloc {
502 my ($self) = @_;
503
504 return unless $self->{visible};
505
506 return if $self->{root}{realloc}{$self};
507
508 $self->{root}{realloc}{$self} = $self;
509 $self->{root}->update;
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
400 518
401sub draw { 519sub draw {
402 my ($self) = @_; 520 my ($self) = @_;
403 521
404 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
442 my ($self) = @_; 560 my ($self) = @_;
443 561
444 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
445} 563}
446 564
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505}
506
507sub DESTROY { 565sub DESTROY {
508 my ($self) = @_; 566 my ($self) = @_;
509 567
510 delete $WIDGET{$self+0}; 568 delete $WIDGET{$self+0};
511 #$self->deactivate; 569 #$self->deactivate;
… …
606 $self->{children} = [ 664 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
609 ]; 667 ];
610 668
611 $self->check_size (1); 669 $self->realloc;
612 $self->update;
613} 670}
614 671
615sub children { 672sub children {
616 @{ $_[0]{children} } 673 @{ $_[0]{children} }
617} 674}
… …
622 delete $child->{parent}; 679 delete $child->{parent};
623 $child->hide; 680 $child->hide;
624 681
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 683
627 $self->check_size (1); 684 $self->realloc;
628 $self->update;
629} 685}
630 686
631sub clear { 687sub clear {
632 my ($self) = @_; 688 my ($self) = @_;
633 689
… …
637 for (@$children) { 693 for (@$children) {
638 delete $_->{parent}; 694 delete $_->{parent};
639 $_->hide; 695 $_->hide;
640 } 696 }
641 697
642 $self->check_size; 698 $self->realloc;
643 $self->update;
644} 699}
645 700
646sub find_widget { 701sub find_widget {
647 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
648 703
… …
701sub size_request { 756sub size_request {
702 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
703} 758}
704 759
705sub size_allocate { 760sub size_allocate {
706 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
707 762
708 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
709} 764}
710 765
711############################################################################# 766#############################################################################
… …
728 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
729 $self->SUPER::update; 784 $self->SUPER::update;
730} 785}
731 786
732sub size_allocate { 787sub size_allocate {
733 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
734 789
735 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
736 $self->update; 791 $self->update
792 if $changed;
737} 793}
738 794
739sub _render { 795sub _render {
740 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
741} 797}
… …
785} 841}
786 842
787sub size_request { 843sub size_request {
788 my ($self) = @_; 844 my ($self) = @_;
789 845
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
791 847
792 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
793} 852}
794 853
795sub size_allocate { 854sub size_allocate {
796 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
797 856
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
800 859
801 $self->child->configure (0, 0, $w, $h); 860 $self->child->configure (0, 0, $w, $h);
… …
857 my $class = shift; 916 my $class = shift;
858 917
859 my $self; 918 my $self;
860 919
861 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
862 vertical => 1, 921 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 923 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 924 $self->{vp}->set_offset (0, $_[1]);
866 }, 925 },
867 ; 926 ;
868 927
869 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
… …
888 my $child = $self->{vp}->child; 947 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
890} 949}
891 950
892sub size_allocate { 951sub size_allocate {
893 my ($self, $w, $h) = @_; 952 my ($self, $w, $h, $changed) = @_;
894 953
895 $self->SUPER::size_allocate ($w, $h); 954 $self->SUPER::size_allocate ($w, $h, $changed);
896 955
897 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
898 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
899} 958}
900 959
… …
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955 1014
956sub new { 1015sub new {
957 my $class = shift; 1016 my $class = shift;
958
959 # TODO: user_x, user_y, overwrite moveto?
960 1017
961 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1021 border => 0.6,
… …
990 $h + $self->border * 2, 1047 $h + $self->border * 2,
991 ) 1048 )
992} 1049}
993 1050
994sub size_allocate { 1051sub size_allocate {
995 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
996 1055
997 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
999 1058
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1024 my ($ev, $x, $y) = @_; 1083 my ($ev, $x, $y) = @_;
1025 1084
1026 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
1028 1087
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1092 $self->move ($self->{user_x}, $self->{user_y});
1032 $self->check_size; 1093 $self->realloc;
1033 }; 1094 };
1034 1095
1035 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1100 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
1041 1102
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1104
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1105 $self->{user_x} = $bx + $x - $ox;
1106 $self->{user_y} = $by + $y - $oy;
1107
1108 $self->move ($self->{user_x}, $self->{user_y});
1045 $self->update; 1109 $self->realloc;
1046 }; 1110 };
1047 } 1111 }
1048} 1112}
1049 1113
1050sub button_up { 1114sub button_up {
… …
1125 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1126 1190
1127 $child->set_parent ($self); 1191 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1129 1193
1130 $self->check_size (1); 1194 $self->realloc;
1131} 1195}
1132 1196
1133# TODO: move to container class maybe? send children a signal on removal? 1197# TODO: move to container class maybe? send children a signal on removal?
1134sub clear { 1198sub clear {
1135 my ($self) = @_; 1199 my ($self) = @_;
… …
1140 for (@children) { 1204 for (@children) {
1141 delete $_->{parent}; 1205 delete $_->{parent};
1142 $_->hide; 1206 $_->hide;
1143 } 1207 }
1144 1208
1145 $self->check_size (1); 1209 $self->realloc;
1146 $self->update;
1147} 1210}
1148 1211
1149sub get_wh { 1212sub get_wh {
1150 my ($self) = @_; 1213 my ($self) = @_;
1151 1214
… …
1178 (sum @$hs), 1241 (sum @$hs),
1179 ) 1242 )
1180} 1243}
1181 1244
1182sub size_allocate { 1245sub size_allocate {
1183 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1184 1247
1185 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1186 1249
1187 my $req_w = (sum @$ws) || 1; 1250 my $req_w = (sum @$ws) || 1;
1188 my $req_h = (sum @$hs) || 1; 1251 my $req_h = (sum @$hs) || 1;
… …
1247 } 1310 }
1248} 1311}
1249 1312
1250############################################################################# 1313#############################################################################
1251 1314
1315package CFClient::UI::Box;
1316
1317our @ISA = CFClient::UI::Container::;
1318
1319sub size_request {
1320 my ($self) = @_;
1321
1322 $self->{vertical}
1323 ? (
1324 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1325 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1326 )
1327 : (
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 )
1331}
1332
1333sub size_allocate {
1334 my ($self, $w, $h, $changed) = @_;
1335
1336 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children};
1338
1339 my @req;
1340
1341 if ($self->{homogeneous}) {
1342 @req = ($space / (@$children || 1)) x @$children;
1343 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1345 my $req = List::Util::sum @req;
1346
1347 if ($req > $space) {
1348 # ah well, not enough space
1349 $_ *= $space / $req for @req;
1350 } else {
1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1352
1353 $space = ($space - $req) / $expand; # remaining space to give away
1354
1355 $req[$_] += $space * $children->[$_]{expand}
1356 for 0 .. $#$children;
1357 }
1358 }
1359
1360 CFClient::UI::harmonize \@req;
1361
1362 my $pos = 0;
1363 for (0 .. $#$children) {
1364 my $alloc = $req[$_];
1365 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1366
1367 $pos += $alloc;
1368 }
1369
1370 1
1371}
1372
1373#############################################################################
1374
1252package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1253 1376
1254# TODO: wrap into common Box base class
1255
1256our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1257 1378
1258sub size_request { 1379sub new {
1259 my ($self) = @_; 1380 my $class = shift;
1260 1381
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1262 1383 vertical => 0,
1263 ( 1384 @_,
1264 (List::Util::sum map $_->[0], @alloc),
1265 (List::Util::max map $_->[1], @alloc),
1266 ) 1385 )
1267} 1386}
1268 1387
1269sub size_allocate {
1270 my ($self, $w, $h) = @_;
1271
1272 ($h, $w) = ($w, $h);
1273
1274 my $children = $self->{children};
1275
1276 my @h = map $_->{req_w}, @$children;
1277
1278 my $req_h = List::Util::sum @h;
1279
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children;
1285 $exp ||= 1;
1286
1287 for (0 .. $#$children) {
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 }
1294 }
1295
1296 CFClient::UI::harmonize \@h;
1297
1298 my $y = 0;
1299 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_];
1302 $child->configure ($y, 0, $h, $w);
1303
1304 $y += $h;
1305 }
1306
1307 1
1308}
1309
1310############################################################################# 1388#############################################################################
1311 1389
1312package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1313 1391
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1317 1393
1318sub size_request { 1394sub new {
1319 my ($self) = @_; 1395 my $class = shift;
1320 1396
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1322 1398 vertical => 1,
1323 ( 1399 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1400 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1401}
1367 1402
1368############################################################################# 1403#############################################################################
1369 1404
1370package CFClient::UI::Label; 1405package CFClient::UI::Label;
… …
1433 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1434 1469
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1437 1472
1438 $self->update; 1473 $self->realloc;
1439 $self->check_size;
1440} 1474}
1441 1475
1442sub set_markup { 1476sub set_markup {
1443 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1444 1478
… …
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1483
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1452 1486
1453 $self->update; 1487 $self->realloc;
1454 $self->check_size;
1455} 1488}
1456 1489
1457sub size_request { 1490sub size_request {
1458 my ($self) = @_; 1491 my ($self) = @_;
1459 1492
… …
1480 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1481 ) 1514 )
1482} 1515}
1483 1516
1484sub size_allocate { 1517sub size_allocate {
1485 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1486 1519
1487 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1488} 1522}
1489 1523
1490sub set_fontsize { 1524sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1492 1526
1493 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1528 delete $self->{texture};
1495 1529
1496 $self->update; 1530 $self->realloc;
1497 $self->check_size;
1498} 1531}
1499 1532
1500sub _draw { 1533sub _draw {
1501 my ($self) = @_; 1534 my ($self) = @_;
1502 1535
… …
1582sub set_text { 1615sub set_text {
1583 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1584 1617
1585 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1619 $self->_set_text ($text);
1587 $self->update; 1620
1588 $self->check_size; 1621 $self->realloc;
1589} 1622}
1590 1623
1591sub get_text { 1624sub get_text {
1592 $_[0]{text} 1625 $_[0]{text}
1593} 1626}
… …
1626 } elsif ($uni) { 1659 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1628 } 1661 }
1629 1662
1630 $self->_set_text ($text); 1663 $self->_set_text ($text);
1631 $self->update; 1664
1632 $self->check_size; 1665 $self->realloc;
1633} 1666}
1634 1667
1635sub focus_in { 1668sub focus_in {
1636 my ($self) = @_; 1669 my ($self) = @_;
1637 1670
… …
2144 $self->update; 2177 $self->update;
2145 2178
2146 $self 2179 $self
2147} 2180}
2148 2181
2182sub changed { }
2183
2149sub set_range { 2184sub set_range {
2150 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2151 2186
2152 ($range, $self->{range}) = ($self->{range}, $range); 2187 ($range, $self->{range}) = ($self->{range}, $range);
2153 2188
… …
2342 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2343 $self->reflow; 2378 $self->reflow;
2344} 2379}
2345 2380
2346sub size_allocate { 2381sub size_allocate {
2347 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2348 2383
2349 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2350 2387
2351 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2352 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2353 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2354 2391
… …
2543 2580
2544sub new { 2581sub new {
2545 my $class = shift; 2582 my $class = shift;
2546 2583
2547 my $self = $class->SUPER::new ( 2584 my $self = $class->SUPER::new (
2548 state => 0, 2585 state => 0,
2549 connect_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2550 @_ 2587 @_
2551 ); 2588 );
2552 2589
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2590 $self
2559} 2591}
2560 2592
2561sub toggle_flopper { 2593sub toggle_flopper {
2562 my ($self) = @_; 2594 my ($self) = @_;
2563 2595
2564 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2597}
2576 2598
2577############################################################################# 2599#############################################################################
2578 2600
2579package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2611 2633
2612 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2613} 2635}
2614 2636
2615sub size_allocate { 2637sub size_allocate {
2616 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2617 2639
2640 return unless $changed;
2641
2618 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2619} 2643}
2620 2644
2621sub _draw { 2645sub _draw {
2622 my ($self) = @_; 2646 my ($self) = @_;
2623 2647
… …
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765 2789
2766 $row++; 2790 $row++;
2767 } 2791 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773} 2792}
2774 2793
2775############################################################################# 2794#############################################################################
2776 2795
2777package CFClient::UI::Menu; 2796package CFClient::UI::Menu;
… …
2963use CFClient::OpenGL; 2982use CFClient::OpenGL;
2964 2983
2965sub new { 2984sub new {
2966 my $class = shift; 2985 my $class = shift;
2967 2986
2968 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
2988 visible => 1,
2969 @_, 2989 @_,
2970 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
2971} 2995}
2972 2996
2973sub configure { 2997sub configure {
2974 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
2975 2999
2976 $self->{w} = $w; 3000 $self->{w} = $w;
2977 $self->{h} = $h; 3001 $self->{h} = $h;
2978} 3002}
2979 3003
2980sub check_size { 3004sub reconfigure {
2981 my ($self) = @_; 3005 my ($self) = @_;
2982 3006
3007 $self->SUPER::reconfigure;
3008
2983 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
2984 if $self->{w}; 3010 if $self->{w};
2985} 3011}
2986 3012
2987sub size_request { 3013sub size_request {
2988 my ($self) = @_; 3014 my ($self) = @_;
2989 3015
2990 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
2991} 3017}
2992 3018
2993sub size_allocate { 3019sub size_allocate {
2994 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
2995 3021
2996 for my $child ($self->children) { 3022 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 3024
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3000 if exists $child->{req_x}; 3026 if exists $child->{req_x};
3001 3027
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3003 if exists $child->{req_y}; 3029 if exists $child->{req_y};
3004 3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3035
3008 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
3009 } 3037 }
… …
3022} 3050}
3023 3051
3024sub update { 3052sub update {
3025 my ($self) = @_; 3053 my ($self) = @_;
3026 3054
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
3029} 3056}
3030 3057
3031sub add { 3058sub add {
3032 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
3033
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039 3060
3040 for my $child (@children) { 3061 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3062 $child->{is_toplevel} = 1;
3042 3063
3043 # integerise window positions 3064 # integerise window positions
… …
3078 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
3079 $_->() 3100 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
3081 } 3102 }
3082 3103
3083 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
3084 my @queue = ([], []); 3105 my @queue;
3085 3106
3086 for (;;) { 3107 while () {
3087 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
3088 # heuristic: check containers last 3109 #TODO use array-of-depth approach
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3110
3090 for values %{delete $self->{check_size}} 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3112 @queue, values %{delete $self->{realloc}};
3091 } 3113 }
3092 3114
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3115 my $widget = pop @queue || last;
3094 3116
3117 $widget->{visible} or last; # do not resize invisible widgets
3118
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3096 ? @$widget{qw(user_w user_h)} 3120 ? @$widget{qw(def_w def_h)}
3097 : $widget->size_request; 3121 : $widget->size_request;
3098 3122
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 3124
3103 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
3105 3127
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3107 3129
3108 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
3109 if $widget->{parent}; 3131 if $widget->{parent};
3110 }
3111 } 3132 }
3112 } 3133 }
3113 3134
3114 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3116 my ($widget, $w, $h) = @$_; 3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3117 3141
3118 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
3120 3144
3121 $widget->{w} = $w; 3145 $widget->{w} = $w;
3122 $widget->{h} = $h; 3146 $widget->{h} = $h;
3123 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
3124 } 3148 }
3125 } 3149 }
3126 3150
3127 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
3128 $_->() 3152 $_->()

Diff Legend

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