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.237 by root, Thu May 25 21:36:45 2006 UTC vs.
Revision 1.253 by root, Sun May 28 23:28:12 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
23 43
24 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide;
46
25 $TOOLTIP->{owner} = $widget; 47 $TOOLTIP->{owner} = $widget;
26 48
27 my $tip = $widget->{tooltip}; 49 my $tip = $widget->{tooltip};
28 50
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 51 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 52
31 $TOOLTIP->set_tooltip_from ($widget); 53 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 54 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 55 }
43 56
44 return; 57 return;
45 } 58 }
46 } 59 }
… …
155 for my $widget (values %WIDGET) { 168 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 169 if ($widget->{is_toplevel}) {
157 $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};
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $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};
162 $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};
163 $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};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 } 176 }
166 } 177 }
167 178
168 reconfigure_widgets; 179 reconfigure_widgets;
169} 180}
… …
186 can_events => 1, 197 can_events => 1,
187 @_ 198 @_
188 }, $class; 199 }, $class;
189 200
190 for (keys %$self) { 201 for (keys %$self) {
191 if (/^connect_(.*)$/) { 202 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 203 $self->connect ($1 => delete $self->{$_});
193 } 204 }
194 } 205 }
195 206
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 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
198 $self 216 $self
199} 217}
200 218
201sub destroy { 219sub destroy {
202 my ($self) = @_; 220 my ($self) = @_;
… …
205 %$self = (); 223 %$self = ();
206} 224}
207 225
208sub show { 226sub show {
209 my ($self) = @_; 227 my ($self) = @_;
228
210 return if $self->{parent}; 229 return if $self->{parent};
211 230
212 $CFClient::UI::ROOT->add ($self); 231 $CFClient::UI::ROOT->add ($self);
213} 232}
214 233
215sub show_centered { 234sub center {
216 my ($self) = @_; 235 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 236
221 $CFClient::UI::ROOT->on_post_alloc ( 237 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 238 "center_$self" => sub {
223 $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);
224 }, 240 },
225 ); 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;
226} 259}
227 260
228sub set_invisible { 261sub set_invisible {
229 my ($self) = @_; 262 my ($self) = @_;
230 263
231 # broken show/hide model 264 return unless $self->{visible};
232 265
266 $_->set_invisible for $self->children;
267
268 delete $self->{root};
233 delete $self->{visible}; 269 delete $self->{visible};
234 270
235 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 272 undef $HOVER if $HOVER == $self;
237 273
238 CFClient::UI::check_tooltip 274 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 275 if $TOOLTIP->{owner} == $self;
240 276
241 $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;
242} 297}
243 298
244sub hide { 299sub hide {
245 my ($self) = @_; 300 my ($self) = @_;
246 301
… …
261} 316}
262 317
263sub set_size { 318sub set_size {
264 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
265 320
266 $self->{user_w} = $w; 321 $self->{def_w} = $w;
267 $self->{user_h} = $h; 322 $self->{def_h} = $h;
268 323
269 $self->check_size; 324 $self->realloc;
270} 325}
271 326
272sub size_request { 327sub size_request {
273 require Carp; 328 require Carp;
274 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
294 $self->{y} = $y; 349 $self->{y} = $y;
295 $self->update; 350 $self->update;
296 } 351 }
297 352
298 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 357 }
301} 358}
302 359
303sub size_allocate { 360sub size_allocate {
304 # nothing to be done 361 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 362}
313 363
314sub children { 364sub children {
315} 365}
316 366
… …
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub 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}
399 512
400sub draw { 513sub draw {
401 my ($self) = @_; 514 my ($self) = @_;
402 515
403 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
441 my ($self) = @_; 554 my ($self) = @_;
442 555
443 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
444} 557}
445 558
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504}
505
506sub DESTROY { 559sub DESTROY {
507 my ($self) = @_; 560 my ($self) = @_;
508 561
509 delete $WIDGET{$self+0}; 562 delete $WIDGET{$self+0};
510 #$self->deactivate; 563 #$self->deactivate;
… …
605 $self->{children} = [ 658 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
608 ]; 661 ];
609 662
610 $self->check_size (1); 663 $self->realloc;
611 $self->update;
612} 664}
613 665
614sub children { 666sub children {
615 @{ $_[0]{children} } 667 @{ $_[0]{children} }
616} 668}
… …
621 delete $child->{parent}; 673 delete $child->{parent};
622 $child->hide; 674 $child->hide;
623 675
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 677
626 $self->check_size (1); 678 $self->realloc;
627 $self->update;
628} 679}
629 680
630sub clear { 681sub clear {
631 my ($self) = @_; 682 my ($self) = @_;
632 683
… …
636 for (@$children) { 687 for (@$children) {
637 delete $_->{parent}; 688 delete $_->{parent};
638 $_->hide; 689 $_->hide;
639 } 690 }
640 691
641 $self->check_size; 692 $self->realloc;
642 $self->update;
643} 693}
644 694
645sub find_widget { 695sub find_widget {
646 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
647 697
… …
700sub size_request { 750sub size_request {
701 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
702} 752}
703 753
704sub size_allocate { 754sub size_allocate {
705 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
706 756
707 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
708} 758}
709 759
710############################################################################# 760#############################################################################
… …
727 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
728 $self->SUPER::update; 778 $self->SUPER::update;
729} 779}
730 780
731sub size_allocate { 781sub size_allocate {
732 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
733 783
734 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
735 $self->update; 785 $self->update
786 if $changed;
736} 787}
737 788
738sub _render { 789sub _render {
739 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
740} 791}
… …
784} 835}
785 836
786sub size_request { 837sub size_request {
787 my ($self) = @_; 838 my ($self) = @_;
788 839
789 @$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)};
790 841
791 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
792} 846}
793 847
794sub size_allocate { 848sub size_allocate {
795 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
796 850
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799 853
800 $self->child->configure (0, 0, $w, $h); 854 $self->child->configure (0, 0, $w, $h);
… …
856 my $class = shift; 910 my $class = shift;
857 911
858 my $self; 912 my $self;
859 913
860 my $slider = new CFClient::UI::Slider 914 my $slider = new CFClient::UI::Slider
861 vertical => 1, 915 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 916 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 917 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 918 $self->{vp}->set_offset (0, $_[1]);
865 }, 919 },
866 ; 920 ;
867 921
868 $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
… …
876 $self->add ($self->{slider}); 930 $self->add ($self->{slider});
877 931
878 $self 932 $self
879} 933}
880 934
935sub update {
936 my ($self) = @_;
937
938 $self->SUPER::update;
939
940 # todo: overwrite size_allocate of child
941 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943}
944
881sub size_allocate { 945sub size_allocate {
882 my ($self, $w, $h) = @_; 946 my ($self, $w, $h, $changed) = @_;
883 947
884 $self->SUPER::size_allocate ($w, $h); 948 $self->SUPER::size_allocate ($w, $h, $changed);
885 949
886 my $child = $self->{vp}->child; 950 my $child = $self->{vp}->child;
887 $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]);
888} 952}
889 953
… …
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 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);
944 1008
945sub new { 1009sub new {
946 my $class = shift; 1010 my $class = shift;
947
948 # TODO: user_x, user_y, overwrite moveto?
949 1011
950 my $self = $class->SUPER::new ( 1012 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1013 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1014 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1015 border => 0.6,
… …
979 $h + $self->border * 2, 1041 $h + $self->border * 2,
980 ) 1042 )
981} 1043}
982 1044
983sub size_allocate { 1045sub size_allocate {
984 my ($self, $w, $h) = @_; 1046 my ($self, $w, $h, $changed) = @_;
1047
1048 return unless $changed;
985 1049
986 $h -= List::Util::max 0, $self->border * 2; 1050 $h -= List::Util::max 0, $self->border * 2;
987 $w -= List::Util::max 0, $self->border * 2; 1051 $w -= List::Util::max 0, $self->border * 2;
988 1052
989 $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)
… …
1013 my ($ev, $x, $y) = @_; 1077 my ($ev, $x, $y) = @_;
1014 1078
1015 my $dx = $ev->{x} - $ox; 1079 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1080 my $dy = $ev->{y} - $oy;
1017 1081
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1086 $self->move ($self->{user_x}, $self->{user_y});
1021 $self->check_size; 1087 $self->realloc;
1022 }; 1088 };
1023 1089
1024 } elsif ($lr ^ $td) { 1090 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1091 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1092 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1028 $self->{motion} = sub { 1094 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1095 my ($ev, $x, $y) = @_;
1030 1096
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1097 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1098
1033 $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});
1034 $self->update; 1103 $self->realloc;
1035 }; 1104 };
1036 } 1105 }
1037} 1106}
1038 1107
1039sub button_up { 1108sub button_up {
… …
1114 my ($self, $x, $y, $child) = @_; 1183 my ($self, $x, $y, $child) = @_;
1115 1184
1116 $child->set_parent ($self); 1185 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child; 1186 $self->{children}[$y][$x] = $child;
1118 1187
1119 $self->check_size (1); 1188 $self->realloc;
1120} 1189}
1121 1190
1122# 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?
1123sub clear { 1192sub clear {
1124 my ($self) = @_; 1193 my ($self) = @_;
… …
1129 for (@children) { 1198 for (@children) {
1130 delete $_->{parent}; 1199 delete $_->{parent};
1131 $_->hide; 1200 $_->hide;
1132 } 1201 }
1133 1202
1134 $self->check_size (1); 1203 $self->realloc;
1135 $self->update;
1136} 1204}
1137 1205
1138sub get_wh { 1206sub get_wh {
1139 my ($self) = @_; 1207 my ($self) = @_;
1140 1208
… …
1167 (sum @$hs), 1235 (sum @$hs),
1168 ) 1236 )
1169} 1237}
1170 1238
1171sub size_allocate { 1239sub size_allocate {
1172 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h, $changed) = @_;
1173 1241
1174 my ($ws, $hs) = $self->get_wh; 1242 my ($ws, $hs) = $self->get_wh;
1175 1243
1176 my $req_w = sum @$ws; 1244 my $req_w = (sum @$ws) || 1;
1177 my $req_h = sum @$hs; 1245 my $req_h = (sum @$hs) || 1;
1178 1246
1179 # TODO: nicer code && do row_expand 1247 # TODO: nicer code && do row_expand
1180 my @col_expand = @{$self->{col_expand}}; 1248 my @col_expand = @{$self->{col_expand}};
1181 @col_expand = (1) x @$ws unless @col_expand; 1249 @col_expand = (1) x @$ws unless @col_expand;
1182 my $col_expand = (sum @col_expand) || 1; 1250 my $col_expand = (sum @col_expand) || 1;
… …
1236 } 1304 }
1237} 1305}
1238 1306
1239############################################################################# 1307#############################################################################
1240 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
1241package CFClient::UI::HBox; 1369package CFClient::UI::HBox;
1242 1370
1243# TODO: wrap into common Box base class
1244
1245our @ISA = CFClient::UI::Container::; 1371our @ISA = CFClient::UI::Box::;
1246 1372
1247sub size_request { 1373sub new {
1248 my ($self) = @_; 1374 my $class = shift;
1249 1375
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1376 $class->SUPER::new (
1251 1377 vertical => 0,
1252 ( 1378 @_,
1253 (List::Util::sum map $_->[0], @alloc),
1254 (List::Util::max map $_->[1], @alloc),
1255 ) 1379 )
1256} 1380}
1257 1381
1258sub size_allocate {
1259 my ($self, $w, $h) = @_;
1260
1261 ($h, $w) = ($w, $h);
1262
1263 my $children = $self->{children};
1264
1265 my @h = map $_->{req_w}, @$children;
1266
1267 my $req_h = List::Util::sum @h;
1268
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children;
1274 $exp ||= 1;
1275
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 }
1283 }
1284
1285 CFClient::UI::harmonize \@h;
1286
1287 my $y = 0;
1288 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_];
1291 $child->configure ($y, 0, $h, $w);
1292
1293 $y += $h;
1294 }
1295
1296 1
1297}
1298
1299############################################################################# 1382#############################################################################
1300 1383
1301package CFClient::UI::VBox; 1384package CFClient::UI::VBox;
1302 1385
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1386our @ISA = CFClient::UI::Box::;
1306 1387
1307sub size_request { 1388sub new {
1308 my ($self) = @_; 1389 my $class = shift;
1309 1390
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1391 $class->SUPER::new (
1311 1392 vertical => 1,
1312 ( 1393 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1394 )
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355} 1395}
1356 1396
1357############################################################################# 1397#############################################################################
1358 1398
1359package CFClient::UI::Label; 1399package CFClient::UI::Label;
… …
1422 $self->{text} = "T$text"; 1462 $self->{text} = "T$text";
1423 1463
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1465 $self->{layout}->set_text ($text);
1426 1466
1467 $self->realloc;
1427 $self->update; 1468 $self->update;
1428 $self->check_size;
1429} 1469}
1430 1470
1431sub set_markup { 1471sub set_markup {
1432 my ($self, $markup) = @_; 1472 my ($self, $markup) = @_;
1433 1473
… …
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1477 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1478
1439 $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;
1440 $self->{layout}->set_markup ($markup); 1480 $self->{layout}->set_markup ($markup);
1441 1481
1482 $self->realloc;
1442 $self->update; 1483 $self->update;
1443 $self->check_size;
1444} 1484}
1445 1485
1446sub size_request { 1486sub size_request {
1447 my ($self) = @_; 1487 my ($self) = @_;
1448 1488
… …
1469 $h + $self->{padding} * 2, 1509 $h + $self->{padding} * 2,
1470 ) 1510 )
1471} 1511}
1472 1512
1473sub size_allocate { 1513sub size_allocate {
1474 my ($self, $w, $h) = @_; 1514 my ($self, $w, $h, $changed) = @_;
1475 1515
1476 delete $self->{texture}; 1516 delete $self->{texture}
1517 if $changed;
1477} 1518}
1478 1519
1479sub set_fontsize { 1520sub set_fontsize {
1480 my ($self, $fontsize) = @_; 1521 my ($self, $fontsize) = @_;
1481 1522
1482 $self->{fontsize} = $fontsize; 1523 $self->{fontsize} = $fontsize;
1483 delete $self->{texture}; 1524 delete $self->{texture};
1484 1525
1485 $self->update; 1526 $self->realloc;
1486 $self->check_size;
1487} 1527}
1488 1528
1489sub _draw { 1529sub _draw {
1490 my ($self) = @_; 1530 my ($self) = @_;
1491 1531
… …
1571sub set_text { 1611sub set_text {
1572 my ($self, $text) = @_; 1612 my ($self, $text) = @_;
1573 1613
1574 $self->{cursor} = length $text; 1614 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 1615 $self->_set_text ($text);
1576 $self->update; 1616
1577 $self->check_size; 1617 $self->realloc;
1578} 1618}
1579 1619
1580sub get_text { 1620sub get_text {
1581 $_[0]{text} 1621 $_[0]{text}
1582} 1622}
… …
1615 } elsif ($uni) { 1655 } elsif ($uni) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 1656 substr $text, $self->{cursor}++, 0, chr $uni;
1617 } 1657 }
1618 1658
1619 $self->_set_text ($text); 1659 $self->_set_text ($text);
1620 $self->update; 1660
1621 $self->check_size; 1661 $self->realloc;
1622} 1662}
1623 1663
1624sub focus_in { 1664sub focus_in {
1625 my ($self) = @_; 1665 my ($self) = @_;
1626 1666
… …
2133 $self->update; 2173 $self->update;
2134 2174
2135 $self 2175 $self
2136} 2176}
2137 2177
2178sub changed { }
2179
2138sub set_range { 2180sub set_range {
2139 my ($self, $range) = @_; 2181 my ($self, $range) = @_;
2140 2182
2141 $self->{range} = $range; 2183 ($range, $self->{range}) = ($self->{range}, $range);
2142 2184
2143 $self->update; 2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2144} 2187}
2145 2188
2146sub set_value { 2189sub set_value {
2147 my ($self, $value) = @_; 2190 my ($self, $value) = @_;
2148 2191
… …
2330 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2331 $self->reflow; 2374 $self->reflow;
2332} 2375}
2333 2376
2334sub size_allocate { 2377sub size_allocate {
2335 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h, $changed) = @_;
2336 2379
2337 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2338 2383
2339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2384 $self->{layout}->set_font ($self->{font}) if $self->{font};
2340 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2341 $self->{layout}->set_width ($self->{children}[0]{w}); 2386 $self->{layout}->set_width ($self->{children}[0]{w});
2342 2387
… …
2531 2576
2532sub new { 2577sub new {
2533 my $class = shift; 2578 my $class = shift;
2534 2579
2535 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2536 state => 0, 2581 state => 0,
2537 connect_activate => \&toggle_flopper, 2582 on_activate => \&toggle_flopper,
2538 @_ 2583 @_
2539 ); 2584 );
2540 2585
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2586 $self
2547} 2587}
2548 2588
2549sub toggle_flopper { 2589sub toggle_flopper {
2550 my ($self) = @_; 2590 my ($self) = @_;
2551 2591
2552 # TODO: use animation 2592 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 2593}
2564 2594
2565############################################################################# 2595#############################################################################
2566 2596
2567package CFClient::UI::Tooltip; 2597package CFClient::UI::Tooltip;
… …
2599 2629
2600 ($w + 4, $h + 4) 2630 ($w + 4, $h + 4)
2601} 2631}
2602 2632
2603sub size_allocate { 2633sub size_allocate {
2604 my ($self, $w, $h) = @_; 2634 my ($self, $w, $h, $changed) = @_;
2605 2635
2636 return unless $changed;
2637
2606 $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
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH;
2653
2654 $self->move ($x, $y);
2655 });
2607} 2656}
2608 2657
2609sub _draw { 2658sub _draw {
2610 my ($self) = @_; 2659 my ($self) = @_;
2611 2660
… …
2628 glVertex $w, $h; 2677 glVertex $w, $h;
2629 glVertex $w, 0; 2678 glVertex $w, 0;
2630 glEnd; 2679 glEnd;
2631 2680
2632 glTranslate 2 - 0.375, 2 - 0.375; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2682
2633 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2634} 2684}
2635 2685
2636############################################################################# 2686#############################################################################
2637 2687
… …
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753 2803
2754 $row++; 2804 $row++;
2755 } 2805 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763} 2806}
2764 2807
2765############################################################################# 2808#############################################################################
2766 2809
2767package CFClient::UI::Menu; 2810package CFClient::UI::Menu;
… …
2953use CFClient::OpenGL; 2996use CFClient::OpenGL;
2954 2997
2955sub new { 2998sub new {
2956 my $class = shift; 2999 my $class = shift;
2957 3000
2958 $class->SUPER::new ( 3001 my $self = $class->SUPER::new (
3002 visible => 1,
2959 @_, 3003 @_,
2960 ) 3004 );
3005
3006 Scalar::Util::weaken ($self->{root} = $self);
3007
3008 $self
2961} 3009}
2962 3010
2963sub configure { 3011sub configure {
2964 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
2965 3013
2966 $self->{w} = $w; 3014 $self->{w} = $w;
2967 $self->{h} = $h; 3015 $self->{h} = $h;
2968} 3016}
2969 3017
2970sub check_size { 3018sub reconfigure {
2971 my ($self) = @_; 3019 my ($self) = @_;
2972 3020
3021 $self->SUPER::reconfigure;
3022
2973 $self->size_allocate ($self->{w}, $self->{h}) 3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
2974 if $self->{w}; 3024 if $self->{w};
2975} 3025}
2976 3026
2977sub size_request { 3027sub size_request {
2978 my ($self) = @_; 3028 my ($self) = @_;
2979 3029
2980 ($self->{w}, $self->{h}) 3030 ($self->{w}, $self->{h})
2981} 3031}
2982 3032
2983sub size_allocate { 3033sub size_allocate {
2984 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h, $changed) = @_;
2985 3035
2986 for my $child ($self->children) { 3036 for my $child ($self->children) {
2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2988 3038
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2990 if exists $child->{req_x}; 3040 if exists $child->{req_x};
2991 3041
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2993 if exists $child->{req_y}; 3043 if exists $child->{req_y};
2994 3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 3049
2998 $child->configure ($X, $Y, $W, $H); 3050 $child->configure ($X, $Y, $W, $H);
2999 } 3051 }
… …
3012} 3064}
3013 3065
3014sub update { 3066sub update {
3015 my ($self) = @_; 3067 my ($self) = @_;
3016 3068
3017 $self->check_size;
3018 $::WANT_REFRESH++; 3069 $::WANT_REFRESH++;
3019} 3070}
3020 3071
3021sub add { 3072sub add {
3022 my ($self, @children) = @_; 3073 my ($self, @children) = @_;
3023
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029 3074
3030 for my $child (@children) { 3075 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3076 $child->{is_toplevel} = 1;
3032 3077
3033 # integerise window positions 3078 # integerise window positions
… …
3068 while ($self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
3069 $_->() 3114 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3115 for values %{delete $self->{refresh_hook}};
3071 } 3116 }
3072 3117
3073 if ($self->{check_size}) { 3118 if ($self->{realloc}) {
3074 my @queue = ([], []); 3119 my @queue;
3075 3120
3076 for (;;) { 3121 while () {
3077 if ($self->{check_size}) { 3122 if ($self->{realloc}) {
3078 # heuristic: check containers last 3123 #TODO use array-of-depth approach
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3124
3080 for values %{delete $self->{check_size}} 3125 @queue = sort { $a->{visible} <=> $b->{visible} }
3126 @queue, values %{delete $self->{realloc}};
3081 } 3127 }
3082 3128
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3129 my $widget = pop @queue || last;
3084 3130
3131 $widget->{visible} or last; # do not resize invisible widgets
3132
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3086 ? @$widget{qw(user_w user_h)} 3134 ? @$widget{qw(def_w def_h)}
3087 : $widget->size_request; 3135 : $widget->size_request;
3088 3136
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092 3138
3093 $widget->{req_w} = $w; 3139 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 3140 $widget->{req_h} = $h;
3095 3141
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3097 3143
3098 $widget->{parent}->check_size 3144 push @queue, $widget->{parent}
3099 if $widget->{parent}; 3145 if $widget->{parent};
3100 }
3101 } 3146 }
3102 } 3147 }
3103 3148
3104 while ($self->{size_alloc}) { 3149 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3106 my ($widget, $w, $h) = @$_; 3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3107 3155
3108 $w = 0 if $w < 0; 3156 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 3157 $h = 0 if $h < 0;
3110 3158
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3160
3111 $widget->{w} = $w; 3161 $widget->{w} = $w;
3112 $widget->{h} = $h; 3162 $widget->{h} = $h;
3163
3113 $widget->emit (size_allocate => $w, $h); 3164 $widget->emit (size_allocate => $w, $h, $changed);
3114 } 3165 }
3115 } 3166 }
3116 3167
3117 while ($self->{post_alloc_hook}) { 3168 while ($self->{post_alloc_hook}) {
3118 $_->() 3169 $_->()

Diff Legend

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