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.254 by root, Mon May 29 01:53:23 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}) {
24 43
25 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide;
46
26 $TOOLTIP->{owner} = $widget; 47 $TOOLTIP->{owner} = $widget;
27 48
28 my $tip = $widget->{tooltip}; 49 my $tip = $widget->{tooltip};
29 50
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 51 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 52
32 $TOOLTIP->set_tooltip_from ($widget); 53 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 54 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 55 }
44 56
45 return; 57 return;
46 } 58 }
47 } 59 }
… …
156 for my $widget (values %WIDGET) { 168 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 169 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 170 $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}; 171 $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}; 172 $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}; 173 $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}; 174 $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}; 175 $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 } 176 }
167 } 177 }
168 178
169 reconfigure_widgets; 179 reconfigure_widgets;
170} 180}
… …
187 can_events => 1, 197 can_events => 1,
188 @_ 198 @_
189 }, $class; 199 }, $class;
190 200
191 for (keys %$self) { 201 for (keys %$self) {
192 if (/^connect_(.*)$/) { 202 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 203 $self->connect ($1 => delete $self->{$_});
194 } 204 }
195 } 205 }
196 206
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH;
211 $self->{req_y} = $layout->{y} * $::HEIGHT;
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
214 }
215
199 $self 216 $self
200} 217}
201 218
202sub destroy { 219sub destroy {
203 my ($self) = @_; 220 my ($self) = @_;
… …
206 %$self = (); 223 %$self = ();
207} 224}
208 225
209sub show { 226sub show {
210 my ($self) = @_; 227 my ($self) = @_;
228
211 return if $self->{parent}; 229 return if $self->{parent};
212 230
213 $CFClient::UI::ROOT->add ($self); 231 $CFClient::UI::ROOT->add ($self);
214} 232}
215 233
216sub show_centered { 234sub center {
217 my ($self) = @_; 235 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221 236
222 $CFClient::UI::ROOT->on_post_alloc ( 237 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub { 238 "center_$self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
225 }, 240 },
226 ); 241 );
242
243 $self->update;
244}
245
246sub set_visible {
247 my ($self) = @_;
248
249 return if $self->{visible};
250
251 $self->{root} = $self->{parent}{root};
252 $self->{visible} = $self->{parent}{visible} + 1;
253
254 $self->emit (visibility_change => 1);
255
256 $self->realloc if !exists $self->{req_w};
257
258 $_->set_visible for $self->children;
227} 259}
228 260
229sub set_invisible { 261sub set_invisible {
230 my ($self) = @_; 262 my ($self) = @_;
231 263
232 # broken show/hide model 264 return unless $self->{visible};
233 265
266 $_->set_invisible for $self->children;
267
268 delete $self->{root};
234 delete $self->{visible}; 269 delete $self->{visible};
235 270
236 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 272 undef $HOVER if $HOVER == $self;
238 273
239 CFClient::UI::check_tooltip 274 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 275 if $TOOLTIP->{owner} == $self;
241 276
242 $self->focus_out; 277 $self->focus_out;
278
279 $self->emit (visibility_change => 0);
280}
281
282sub set_visibility {
283 my ($self, $visible) = @_;
284
285 return if $self->{visible} == $visible;
286
287 $visible ? $self->hide
288 : $self->show;
289}
290
291sub toggle_visibility {
292 my ($self) = @_;
293
294 $self->{visible}
295 ? $self->hide
296 : $self->show;
243} 297}
244 298
245sub hide { 299sub hide {
246 my ($self) = @_; 300 my ($self) = @_;
247 301
… …
262} 316}
263 317
264sub set_size { 318sub set_size {
265 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
266 320
267 $self->{user_w} = $w; 321 $self->{def_w} = $w;
268 $self->{user_h} = $h; 322 $self->{def_h} = $h;
269 323
270 $self->check_size; 324 $self->realloc;
271} 325}
272 326
273sub size_request { 327sub size_request {
274 require Carp; 328 require Carp;
275 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
295 $self->{y} = $y; 349 $self->{y} = $y;
296 $self->update; 350 $self->update;
297 } 351 }
298 352
299 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
301 } 357 }
302} 358}
303 359
304sub size_allocate { 360sub size_allocate {
305 # nothing to be done 361 # nothing to be done
306}
307
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313} 362}
314 363
315sub children { 364sub children {
316} 365}
317 366
… …
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
399sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449
450sub find_widget {
451 my ($self, $x, $y) = @_;
452
453 return () unless $self->{can_events};
454
455 return $self
456 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
457 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
458
459 ()
460}
461
462sub set_parent {
463 my ($self, $parent) = @_;
464
465 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible};
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub _emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub emit {
483 my ($self, $signal, @args) = @_;
484
485 $self->_emit ($signal, @args)
486 || $self->$signal (@args);
487}
488
489sub visibility_change {
490 #my ($self, $visible) = @_;
491}
492
493sub realloc {
494 my ($self) = @_;
495
496 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self};
498
499 $self->{root}{realloc}{$self} = $self;
500 $self->{root}->update;
501 } else {
502 delete $self->{req_w};
503 }
504}
505
506sub update {
507 my ($self) = @_;
508
509 $self->{parent}->update
510 if $self->{parent};
511}
400 512
401sub draw { 513sub draw {
402 my ($self) = @_; 514 my ($self) = @_;
403 515
404 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
442 my ($self) = @_; 554 my ($self) = @_;
443 555
444 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
445} 557}
446 558
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 { 559sub DESTROY {
508 my ($self) = @_; 560 my ($self) = @_;
509 561
510 delete $WIDGET{$self+0}; 562 delete $WIDGET{$self+0};
511 #$self->deactivate; 563 #$self->deactivate;
… …
606 $self->{children} = [ 658 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
609 ]; 661 ];
610 662
611 $self->check_size (1); 663 $self->realloc;
612 $self->update;
613} 664}
614 665
615sub children { 666sub children {
616 @{ $_[0]{children} } 667 @{ $_[0]{children} }
617} 668}
… …
622 delete $child->{parent}; 673 delete $child->{parent};
623 $child->hide; 674 $child->hide;
624 675
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 677
627 $self->check_size (1); 678 $self->realloc;
628 $self->update;
629} 679}
630 680
631sub clear { 681sub clear {
632 my ($self) = @_; 682 my ($self) = @_;
633 683
… …
637 for (@$children) { 687 for (@$children) {
638 delete $_->{parent}; 688 delete $_->{parent};
639 $_->hide; 689 $_->hide;
640 } 690 }
641 691
642 $self->check_size; 692 $self->realloc;
643 $self->update;
644} 693}
645 694
646sub find_widget { 695sub find_widget {
647 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
648 697
… …
701sub size_request { 750sub size_request {
702 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
703} 752}
704 753
705sub size_allocate { 754sub size_allocate {
706 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
707 756
708 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
709} 758}
710 759
711############################################################################# 760#############################################################################
… …
728 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
729 $self->SUPER::update; 778 $self->SUPER::update;
730} 779}
731 780
732sub size_allocate { 781sub size_allocate {
733 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
734 783
735 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
736 $self->update; 785 $self->update
786 if $changed;
737} 787}
738 788
739sub _render { 789sub _render {
740 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
741} 791}
… …
785} 835}
786 836
787sub size_request { 837sub size_request {
788 my ($self) = @_; 838 my ($self) = @_;
789 839
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
791 841
792 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
793} 846}
794 847
795sub size_allocate { 848sub size_allocate {
796 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
797 850
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
800 853
801 $self->child->configure (0, 0, $w, $h); 854 $self->child->configure (0, 0, $w, $h);
… …
857 my $class = shift; 910 my $class = shift;
858 911
859 my $self; 912 my $self;
860 913
861 my $slider = new CFClient::UI::Slider 914 my $slider = new CFClient::UI::Slider
862 vertical => 1, 915 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 916 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 917 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 918 $self->{vp}->set_offset (0, $_[1]);
866 }, 919 },
867 ; 920 ;
868 921
869 $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
… …
888 my $child = $self->{vp}->child; 941 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
890} 943}
891 944
892sub size_allocate { 945sub size_allocate {
893 my ($self, $w, $h) = @_; 946 my ($self, $w, $h, $changed) = @_;
894 947
895 $self->SUPER::size_allocate ($w, $h); 948 $self->SUPER::size_allocate ($w, $h, $changed);
896 949
897 my $child = $self->{vp}->child; 950 my $child = $self->{vp}->child;
898 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
899} 952}
900 953
… …
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1006 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); 1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955 1008
956sub new { 1009sub new {
957 my $class = shift; 1010 my $class = shift;
958
959 # TODO: user_x, user_y, overwrite moveto?
960 1011
961 my $self = $class->SUPER::new ( 1012 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1013 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1014 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1015 border => 0.6,
… …
990 $h + $self->border * 2, 1041 $h + $self->border * 2,
991 ) 1042 )
992} 1043}
993 1044
994sub size_allocate { 1045sub size_allocate {
995 my ($self, $w, $h) = @_; 1046 my ($self, $w, $h, $changed) = @_;
1047
1048 return unless $changed;
996 1049
997 $h -= List::Util::max 0, $self->border * 2; 1050 $h -= List::Util::max 0, $self->border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1051 $w -= List::Util::max 0, $self->border * 2;
999 1052
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1024 my ($ev, $x, $y) = @_; 1077 my ($ev, $x, $y) = @_;
1025 1078
1026 my $dx = $ev->{x} - $ox; 1079 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1080 my $dy = $ev->{y} - $oy;
1028 1081
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1086 $self->move ($self->{user_x}, $self->{user_y});
1032 $self->check_size; 1087 $self->realloc;
1033 }; 1088 };
1034 1089
1035 } elsif ($lr ^ $td) { 1090 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1091 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1092 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1094 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1095 my ($ev, $x, $y) = @_;
1041 1096
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1097 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1098
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1099 $self->{user_x} = $bx + $x - $ox;
1100 $self->{user_y} = $by + $y - $oy;
1101
1102 $self->move ($self->{user_x}, $self->{user_y});
1045 $self->update; 1103 $self->realloc;
1046 }; 1104 };
1047 } 1105 }
1048} 1106}
1049 1107
1050sub button_up { 1108sub button_up {
… …
1125 my ($self, $x, $y, $child) = @_; 1183 my ($self, $x, $y, $child) = @_;
1126 1184
1127 $child->set_parent ($self); 1185 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1186 $self->{children}[$y][$x] = $child;
1129 1187
1130 $self->check_size (1); 1188 $self->realloc;
1131} 1189}
1132 1190
1133# TODO: move to container class maybe? send children a signal on removal? 1191# TODO: move to container class maybe? send children a signal on removal?
1134sub clear { 1192sub clear {
1135 my ($self) = @_; 1193 my ($self) = @_;
… …
1140 for (@children) { 1198 for (@children) {
1141 delete $_->{parent}; 1199 delete $_->{parent};
1142 $_->hide; 1200 $_->hide;
1143 } 1201 }
1144 1202
1145 $self->check_size (1); 1203 $self->realloc;
1146 $self->update;
1147} 1204}
1148 1205
1149sub get_wh { 1206sub get_wh {
1150 my ($self) = @_; 1207 my ($self) = @_;
1151 1208
… …
1178 (sum @$hs), 1235 (sum @$hs),
1179 ) 1236 )
1180} 1237}
1181 1238
1182sub size_allocate { 1239sub size_allocate {
1183 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h, $changed) = @_;
1184 1241
1185 my ($ws, $hs) = $self->get_wh; 1242 my ($ws, $hs) = $self->get_wh;
1186 1243
1187 my $req_w = (sum @$ws) || 1; 1244 my $req_w = (sum @$ws) || 1;
1188 my $req_h = (sum @$hs) || 1; 1245 my $req_h = (sum @$hs) || 1;
… …
1247 } 1304 }
1248} 1305}
1249 1306
1250############################################################################# 1307#############################################################################
1251 1308
1309package CFClient::UI::Box;
1310
1311our @ISA = CFClient::UI::Container::;
1312
1313sub size_request {
1314 my ($self) = @_;
1315
1316 $self->{vertical}
1317 ? (
1318 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1320 )
1321 : (
1322 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 )
1325}
1326
1327sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_;
1329
1330 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children};
1332
1333 my @req;
1334
1335 if ($self->{homogeneous}) {
1336 @req = ($space / (@$children || 1)) x @$children;
1337 } else {
1338 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1339 my $req = List::Util::sum @req;
1340
1341 if ($req > $space) {
1342 # ah well, not enough space
1343 $_ *= $space / $req for @req;
1344 } else {
1345 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1346
1347 $space = ($space - $req) / $expand; # remaining space to give away
1348
1349 $req[$_] += $space * $children->[$_]{expand}
1350 for 0 .. $#$children;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@req;
1355
1356 my $pos = 0;
1357 for (0 .. $#$children) {
1358 my $alloc = $req[$_];
1359 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1360
1361 $pos += $alloc;
1362 }
1363
1364 1
1365}
1366
1367#############################################################################
1368
1252package CFClient::UI::HBox; 1369package CFClient::UI::HBox;
1253 1370
1254# TODO: wrap into common Box base class
1255
1256our @ISA = CFClient::UI::Container::; 1371our @ISA = CFClient::UI::Box::;
1257 1372
1258sub size_request { 1373sub new {
1259 my ($self) = @_; 1374 my $class = shift;
1260 1375
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1376 $class->SUPER::new (
1262 1377 vertical => 0,
1263 ( 1378 @_,
1264 (List::Util::sum map $_->[0], @alloc),
1265 (List::Util::max map $_->[1], @alloc),
1266 ) 1379 )
1267} 1380}
1268 1381
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############################################################################# 1382#############################################################################
1311 1383
1312package CFClient::UI::VBox; 1384package CFClient::UI::VBox;
1313 1385
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1386our @ISA = CFClient::UI::Box::;
1317 1387
1318sub size_request { 1388sub new {
1319 my ($self) = @_; 1389 my $class = shift;
1320 1390
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1391 $class->SUPER::new (
1322 1392 vertical => 1,
1323 ( 1393 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1394 )
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} 1395}
1367 1396
1368############################################################################# 1397#############################################################################
1369 1398
1370package CFClient::UI::Label; 1399package CFClient::UI::Label;
… …
1433 $self->{text} = "T$text"; 1462 $self->{text} = "T$text";
1434 1463
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1465 $self->{layout}->set_text ($text);
1437 1466
1467 $self->realloc;
1438 $self->update; 1468 $self->update;
1439 $self->check_size;
1440} 1469}
1441 1470
1442sub set_markup { 1471sub set_markup {
1443 my ($self, $markup) = @_; 1472 my ($self, $markup) = @_;
1444 1473
… …
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1477 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1478
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1480 $self->{layout}->set_markup ($markup);
1452 1481
1482 $self->realloc;
1453 $self->update; 1483 $self->update;
1454 $self->check_size;
1455} 1484}
1456 1485
1457sub size_request { 1486sub size_request {
1458 my ($self) = @_; 1487 my ($self) = @_;
1459 1488
… …
1480 $h + $self->{padding} * 2, 1509 $h + $self->{padding} * 2,
1481 ) 1510 )
1482} 1511}
1483 1512
1484sub size_allocate { 1513sub size_allocate {
1485 my ($self, $w, $h) = @_; 1514 my ($self, $w, $h, $changed) = @_;
1486 1515
1487 delete $self->{texture}; 1516 delete $self->{texture}
1517 if $changed;
1488} 1518}
1489 1519
1490sub set_fontsize { 1520sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1521 my ($self, $fontsize) = @_;
1492 1522
1493 $self->{fontsize} = $fontsize; 1523 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1524 delete $self->{texture};
1495 1525
1496 $self->update; 1526 $self->realloc;
1497 $self->check_size;
1498} 1527}
1499 1528
1500sub _draw { 1529sub _draw {
1501 my ($self) = @_; 1530 my ($self) = @_;
1502 1531
… …
1582sub set_text { 1611sub set_text {
1583 my ($self, $text) = @_; 1612 my ($self, $text) = @_;
1584 1613
1585 $self->{cursor} = length $text; 1614 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1615 $self->_set_text ($text);
1587 $self->update; 1616
1588 $self->check_size; 1617 $self->realloc;
1589} 1618}
1590 1619
1591sub get_text { 1620sub get_text {
1592 $_[0]{text} 1621 $_[0]{text}
1593} 1622}
… …
1626 } elsif ($uni) { 1655 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1656 substr $text, $self->{cursor}++, 0, chr $uni;
1628 } 1657 }
1629 1658
1630 $self->_set_text ($text); 1659 $self->_set_text ($text);
1631 $self->update; 1660
1632 $self->check_size; 1661 $self->realloc;
1633} 1662}
1634 1663
1635sub focus_in { 1664sub focus_in {
1636 my ($self) = @_; 1665 my ($self) = @_;
1637 1666
… …
2144 $self->update; 2173 $self->update;
2145 2174
2146 $self 2175 $self
2147} 2176}
2148 2177
2178sub changed { }
2179
2149sub set_range { 2180sub set_range {
2150 my ($self, $range) = @_; 2181 my ($self, $range) = @_;
2151 2182
2152 ($range, $self->{range}) = ($self->{range}, $range); 2183 ($range, $self->{range}) = ($self->{range}, $range);
2153 2184
… …
2342 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2343 $self->reflow; 2374 $self->reflow;
2344} 2375}
2345 2376
2346sub size_allocate { 2377sub size_allocate {
2347 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h, $changed) = @_;
2348 2379
2349 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2350 2383
2351 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2384 $self->{layout}->set_font ($self->{font}) if $self->{font};
2352 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2353 $self->{layout}->set_width ($self->{children}[0]{w}); 2386 $self->{layout}->set_width ($self->{children}[0]{w});
2354 2387
… …
2543 2576
2544sub new { 2577sub new {
2545 my $class = shift; 2578 my $class = shift;
2546 2579
2547 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2548 state => 0, 2581 state => 0,
2549 connect_activate => \&toggle_flopper, 2582 on_activate => \&toggle_flopper,
2550 @_ 2583 @_
2551 ); 2584 );
2552 2585
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2586 $self
2559} 2587}
2560 2588
2561sub toggle_flopper { 2589sub toggle_flopper {
2562 my ($self) = @_; 2590 my ($self) = @_;
2563 2591
2564 # TODO: use animation 2592 $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} 2593}
2576 2594
2577############################################################################# 2595#############################################################################
2578 2596
2579package CFClient::UI::Tooltip; 2597package CFClient::UI::Tooltip;
… …
2611 2629
2612 ($w + 4, $h + 4) 2630 ($w + 4, $h + 4)
2613} 2631}
2614 2632
2615sub size_allocate { 2633sub size_allocate {
2616 my ($self, $w, $h) = @_; 2634 my ($self, $w, $h, $changed) = @_;
2617 2635
2636 return unless $changed;
2637
2618 $self->SUPER::size_allocate ($w - 4, $h - 4); 2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2639}
2640
2641sub visibility_change {
2642 my ($self, $visible) = @_;
2643
2644 return unless $visible;
2645
2646 $self->{root}->on_post_alloc ("move_$self" => sub {
2647 my $widget = $self->{owner}
2648 or return;
2649
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH;
2654
2655 $self->move ($x, $y);
2656 });
2619} 2657}
2620 2658
2621sub _draw { 2659sub _draw {
2622 my ($self) = @_; 2660 my ($self) = @_;
2623 2661
… …
2640 glVertex $w, $h; 2678 glVertex $w, $h;
2641 glVertex $w, 0; 2679 glVertex $w, 0;
2642 glEnd; 2680 glEnd;
2643 2681
2644 glTranslate 2 - 0.375, 2 - 0.375; 2682 glTranslate 2 - 0.375, 2 - 0.375;
2683
2645 $self->SUPER::_draw; 2684 $self->SUPER::_draw;
2646} 2685}
2647 2686
2648############################################################################# 2687#############################################################################
2649 2688
… …
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765 2804
2766 $row++; 2805 $row++;
2767 } 2806 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773} 2807}
2774 2808
2775############################################################################# 2809#############################################################################
2776 2810
2777package CFClient::UI::Menu; 2811package CFClient::UI::Menu;
… …
2963use CFClient::OpenGL; 2997use CFClient::OpenGL;
2964 2998
2965sub new { 2999sub new {
2966 my $class = shift; 3000 my $class = shift;
2967 3001
2968 $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
3003 visible => 1,
2969 @_, 3004 @_,
2970 ) 3005 );
3006
3007 Scalar::Util::weaken ($self->{root} = $self);
3008
3009 $self
2971} 3010}
2972 3011
2973sub configure { 3012sub configure {
2974 my ($self, $x, $y, $w, $h) = @_; 3013 my ($self, $x, $y, $w, $h) = @_;
2975 3014
2976 $self->{w} = $w; 3015 $self->{w} = $w;
2977 $self->{h} = $h; 3016 $self->{h} = $h;
2978} 3017}
2979 3018
2980sub check_size { 3019sub reconfigure {
2981 my ($self) = @_; 3020 my ($self) = @_;
2982 3021
3022 $self->SUPER::reconfigure;
3023
2983 $self->size_allocate ($self->{w}, $self->{h}) 3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
2984 if $self->{w}; 3025 if $self->{w};
2985} 3026}
2986 3027
2987sub size_request { 3028sub size_request {
2988 my ($self) = @_; 3029 my ($self) = @_;
2989 3030
2990 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
2991} 3032}
2992 3033
2993sub size_allocate { 3034sub size_allocate {
2994 my ($self, $w, $h) = @_; 3035 my ($self, $w, $h, $changed) = @_;
2995 3036
2996 for my $child ($self->children) { 3037 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 3039
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3000 if exists $child->{req_x}; 3041 if exists $child->{req_x};
3001 3042
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3003 if exists $child->{req_y}; 3044 if exists $child->{req_y};
3004 3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3005 $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;
3006 $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;
3007 3050
3008 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
3009 } 3052 }
… …
3022} 3065}
3023 3066
3024sub update { 3067sub update {
3025 my ($self) = @_; 3068 my ($self) = @_;
3026 3069
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3070 $::WANT_REFRESH++;
3029} 3071}
3030 3072
3031sub add { 3073sub add {
3032 my ($self, @children) = @_; 3074 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 3075
3040 for my $child (@children) { 3076 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3077 $child->{is_toplevel} = 1;
3042 3078
3043 # integerise window positions 3079 # integerise window positions
… …
3078 while ($self->{refresh_hook}) { 3114 while ($self->{refresh_hook}) {
3079 $_->() 3115 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3116 for values %{delete $self->{refresh_hook}};
3081 } 3117 }
3082 3118
3083 if ($self->{check_size}) { 3119 if ($self->{realloc}) {
3084 my @queue = ([], []); 3120 my @queue;
3085 3121
3086 for (;;) { 3122 while () {
3087 if ($self->{check_size}) { 3123 if ($self->{realloc}) {
3088 # heuristic: check containers last 3124 #TODO use array-of-depth approach
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3125
3090 for values %{delete $self->{check_size}} 3126 @queue = sort { $a->{visible} <=> $b->{visible} }
3127 @queue, values %{delete $self->{realloc}};
3091 } 3128 }
3092 3129
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3130 my $widget = pop @queue || last;
3094 3131
3132 $widget->{visible} or last; # do not resize invisible widgets
3133
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3096 ? @$widget{qw(user_w user_h)} 3135 ? @$widget{qw(def_w def_h)}
3097 : $widget->size_request; 3136 : $widget->size_request;
3098 3137
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# 3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 3139
3103 $widget->{req_w} = $w; 3140 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3141 $widget->{req_h} = $h;
3105 3142
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3107 3144
3108 $widget->{parent}->check_size 3145 push @queue, $widget->{parent}
3109 if $widget->{parent}; 3146 if $widget->{parent};
3110 }
3111 } 3147 }
3112 } 3148 }
3113 3149
3114 while ($self->{size_alloc}) { 3150 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3116 my ($widget, $w, $h) = @$_; 3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3117 3156
3118 $w = 0 if $w < 0; 3157 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3158 $h = 0 if $h < 0;
3120 3159
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3161
3121 $widget->{w} = $w; 3162 $widget->{w} = $w;
3122 $widget->{h} = $h; 3163 $widget->{h} = $h;
3164
3123 $widget->emit (size_allocate => $w, $h); 3165 $widget->emit (size_allocate => $w, $h, $changed);
3124 } 3166 }
3125 } 3167 }
3126 3168
3127 while ($self->{post_alloc_hook}) { 3169 while ($self->{post_alloc_hook}) {
3128 $_->() 3170 $_->()

Diff Legend

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