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.235 by root, Thu May 25 16:35:42 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 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}) {
… …
35 55
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH; 57 if $x + $TOOLTIP->{w} > $::WIDTH;
38 58
39 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update; 60 $TOOLTIP->realloc;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
157 $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};
158 $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};
159 $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};
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}; 179 $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}; 180 $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}; 181 $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 } 182 }
166 } 183 }
167 184
168 reconfigure_widgets; 185 reconfigure_widgets;
169} 186}
… …
186 can_events => 1, 203 can_events => 1,
187 @_ 204 @_
188 }, $class; 205 }, $class;
189 206
190 for (keys %$self) { 207 for (keys %$self) {
191 if (/^connect_(.*)$/) { 208 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 209 $self->connect ($1 => delete $self->{$_});
193 } 210 }
194 } 211 }
195 212
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 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
198 $self 222 $self
199} 223}
200 224
201sub destroy { 225sub destroy {
202 my ($self) = @_; 226 my ($self) = @_;
… …
205 %$self = (); 229 %$self = ();
206} 230}
207 231
208sub show { 232sub show {
209 my ($self) = @_; 233 my ($self) = @_;
234
210 return if $self->{parent}; 235 return if $self->{parent};
211 236
212 $CFClient::UI::ROOT->add ($self); 237 $CFClient::UI::ROOT->add ($self);
213} 238}
214 239
215sub show_centered { 240sub center {
216 my ($self) = @_; 241 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 242
221 $CFClient::UI::ROOT->on_post_alloc ( 243 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 244 "center_$self" => sub {
223 $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);
224 }, 246 },
225 ); 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;
226} 265}
227 266
228sub set_invisible { 267sub set_invisible {
229 my ($self) = @_; 268 my ($self) = @_;
230 269
231 # broken show/hide model 270 return unless $self->{visible};
232 271
272 $_->set_invisible for $self->children;
273
274 delete $self->{root};
233 delete $self->{visible}; 275 delete $self->{visible};
234 276
235 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 278 undef $HOVER if $HOVER == $self;
237 279
238 CFClient::UI::check_tooltip 280 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 281 if $TOOLTIP->{owner} == $self;
240 282
241 $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;
242} 303}
243 304
244sub hide { 305sub hide {
245 my ($self) = @_; 306 my ($self) = @_;
246 307
… …
261} 322}
262 323
263sub set_size { 324sub set_size {
264 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
265 326
266 $self->{user_w} = $w; 327 $self->{def_w} = $w;
267 $self->{user_h} = $h; 328 $self->{def_h} = $h;
268 329
269 $self->check_size; 330 $self->realloc;
270} 331}
271 332
272sub size_request { 333sub size_request {
273 require Carp; 334 require Carp;
274 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
294 $self->{y} = $y; 355 $self->{y} = $y;
295 $self->update; 356 $self->update;
296 } 357 }
297 358
298 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 363 }
301} 364}
302 365
303sub size_allocate { 366sub size_allocate {
304 # nothing to be done 367 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 368}
313 369
314sub children { 370sub children {
315} 371}
316 372
… …
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub 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}
399 518
400sub draw { 519sub draw {
401 my ($self) = @_; 520 my ($self) = @_;
402 521
403 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
441 my ($self) = @_; 560 my ($self) = @_;
442 561
443 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
444} 563}
445 564
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 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 565sub DESTROY {
504 my ($self) = @_; 566 my ($self) = @_;
505 567
506 delete $WIDGET{$self+0}; 568 delete $WIDGET{$self+0};
507 #$self->deactivate; 569 #$self->deactivate;
… …
602 $self->{children} = [ 664 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
605 ]; 667 ];
606 668
607 $self->check_size (1); 669 $self->realloc;
608 $self->update;
609} 670}
610 671
611sub children { 672sub children {
612 @{ $_[0]{children} } 673 @{ $_[0]{children} }
613} 674}
… …
618 delete $child->{parent}; 679 delete $child->{parent};
619 $child->hide; 680 $child->hide;
620 681
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 683
623 $self->check_size; 684 $self->realloc;
624 $self->update;
625} 685}
626 686
627sub clear { 687sub clear {
628 my ($self) = @_; 688 my ($self) = @_;
629 689
… …
633 for (@$children) { 693 for (@$children) {
634 delete $_->{parent}; 694 delete $_->{parent};
635 $_->hide; 695 $_->hide;
636 } 696 }
637 697
638 $self->check_size; 698 $self->realloc;
639 $self->update;
640} 699}
641 700
642sub find_widget { 701sub find_widget {
643 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
644 703
… …
697sub size_request { 756sub size_request {
698 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
699} 758}
700 759
701sub size_allocate { 760sub size_allocate {
702 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
703 762
704 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
705} 764}
706 765
707############################################################################# 766#############################################################################
… …
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 784 $self->SUPER::update;
726} 785}
727 786
728sub size_allocate { 787sub size_allocate {
729 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
730 789
731 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
732 $self->update; 791 $self->update
792 if $changed;
733} 793}
734 794
735sub _render { 795sub _render {
736 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
737} 797}
… …
781} 841}
782 842
783sub size_request { 843sub size_request {
784 my ($self) = @_; 844 my ($self) = @_;
785 845
786 @$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)};
787 847
788 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
789} 852}
790 853
791sub size_allocate { 854sub size_allocate {
792 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
793 856
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796 859
797 $self->child->configure (0, 0, $w, $h); 860 $self->child->configure (0, 0, $w, $h);
… …
853 my $class = shift; 916 my $class = shift;
854 917
855 my $self; 918 my $self;
856 919
857 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
858 vertical => 1, 921 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 923 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 924 $self->{vp}->set_offset (0, $_[1]);
862 }, 925 },
863 ; 926 ;
864 927
865 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
… …
873 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
874 937
875 $self 938 $self
876} 939}
877 940
941sub update {
942 my ($self) = @_;
943
944 $self->SUPER::update;
945
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
878sub size_allocate { 951sub size_allocate {
879 my ($self, $w, $h) = @_; 952 my ($self, $w, $h, $changed) = @_;
880 953
881 $self->SUPER::size_allocate ($w, $h); 954 $self->SUPER::size_allocate ($w, $h, $changed);
882 955
883 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
884 $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]);
885} 958}
886 959
… …
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 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);
941 1014
942sub new { 1015sub new {
943 my $class = shift; 1016 my $class = shift;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1017
947 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1021 border => 0.6,
… …
976 $h + $self->border * 2, 1047 $h + $self->border * 2,
977 ) 1048 )
978} 1049}
979 1050
980sub size_allocate { 1051sub size_allocate {
981 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
982 1055
983 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
985 1058
986 $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)
… …
1010 my ($ev, $x, $y) = @_; 1083 my ($ev, $x, $y) = @_;
1011 1084
1012 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
1014 1087
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1092 $self->move ($self->{user_x}, $self->{user_y});
1018 $self->check_size; 1093 $self->realloc;
1019 }; 1094 };
1020 1095
1021 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1100 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
1027 1102
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1104
1030 $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});
1031 $self->update; 1109 $self->realloc;
1032 }; 1110 };
1033 } 1111 }
1034} 1112}
1035 1113
1036sub button_up { 1114sub button_up {
… …
1101 col_expand => [], 1179 col_expand => [],
1102 @_, 1180 @_,
1103 ) 1181 )
1104} 1182}
1105 1183
1184sub children {
1185 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1186}
1187
1106sub add { 1188sub add {
1107 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1108 1190
1109 $child->set_parent ($self); 1191 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1111 1193
1112 $child->check_size; 1194 $self->realloc;
1113} 1195}
1114 1196
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal? 1197# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1198sub clear {
1121 my ($self) = @_; 1199 my ($self) = @_;
1122 1200
1123 my @children = $self->children; 1201 my @children = $self->children;
1124 delete $self->{children}; 1202 delete $self->{children};
… …
1126 for (@children) { 1204 for (@children) {
1127 delete $_->{parent}; 1205 delete $_->{parent};
1128 $_->hide; 1206 $_->hide;
1129 } 1207 }
1130 1208
1131 $self->update; 1209 $self->realloc;
1132} 1210}
1133 1211
1134sub get_wh { 1212sub get_wh {
1135 my ($self) = @_; 1213 my ($self) = @_;
1136 1214
… …
1163 (sum @$hs), 1241 (sum @$hs),
1164 ) 1242 )
1165} 1243}
1166 1244
1167sub size_allocate { 1245sub size_allocate {
1168 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1169 1247
1170 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1171 1249
1172 my $req_w = sum @$ws; 1250 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1251 my $req_h = (sum @$hs) || 1;
1174 1252
1175 # TODO: nicer code && do row_expand 1253 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1254 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1255 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1256 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1310 }
1233} 1311}
1234 1312
1235############################################################################# 1313#############################################################################
1236 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
1237package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1238 1376
1239# TODO: wrap into common Box base class
1240
1241our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1242 1378
1243sub size_request { 1379sub new {
1244 my ($self) = @_; 1380 my $class = shift;
1245 1381
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1247 1383 vertical => 0,
1248 ( 1384 @_,
1249 (List::Util::sum map $_->[0], @alloc),
1250 (List::Util::max map $_->[1], @alloc),
1251 ) 1385 )
1252} 1386}
1253 1387
1254sub size_allocate {
1255 my ($self, $w, $h) = @_;
1256
1257 ($h, $w) = ($w, $h);
1258
1259 my $children = $self->{children};
1260
1261 my @h = map $_->{req_w}, @$children;
1262
1263 my $req_h = List::Util::sum @h;
1264
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children;
1270 $exp ||= 1;
1271
1272 for (0 .. $#$children) {
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 }
1279 }
1280
1281 CFClient::UI::harmonize \@h;
1282
1283 my $y = 0;
1284 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_];
1287 $child->configure ($y, 0, $h, $w);
1288
1289 $y += $h;
1290 }
1291
1292 1
1293}
1294
1295############################################################################# 1388#############################################################################
1296 1389
1297package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1298 1391
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1302 1393
1303sub size_request { 1394sub new {
1304 my ($self) = @_; 1395 my $class = shift;
1305 1396
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1307 1398 vertical => 1,
1308 ( 1399 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1400 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1401}
1352 1402
1353############################################################################# 1403#############################################################################
1354 1404
1355package CFClient::UI::Label; 1405package CFClient::UI::Label;
… …
1418 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1419 1469
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1422 1472
1423 $self->update; 1473 $self->realloc;
1424 $self->check_size;
1425} 1474}
1426 1475
1427sub set_markup { 1476sub set_markup {
1428 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1429 1478
… …
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1483
1435 $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;
1436 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1437 1486
1438 $self->update; 1487 $self->realloc;
1439 $self->check_size;
1440} 1488}
1441 1489
1442sub size_request { 1490sub size_request {
1443 my ($self) = @_; 1491 my ($self) = @_;
1444 1492
… …
1465 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1466 ) 1514 )
1467} 1515}
1468 1516
1469sub size_allocate { 1517sub size_allocate {
1470 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1471 1519
1472 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1473} 1522}
1474 1523
1475sub set_fontsize { 1524sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1477 1526
1478 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1528 delete $self->{texture};
1480 1529
1481 $self->update; 1530 $self->realloc;
1482 $self->check_size;
1483} 1531}
1484 1532
1485sub _draw { 1533sub _draw {
1486 my ($self) = @_; 1534 my ($self) = @_;
1487 1535
… …
1567sub set_text { 1615sub set_text {
1568 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1569 1617
1570 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1619 $self->_set_text ($text);
1572 $self->update; 1620
1573 $self->check_size; 1621 $self->realloc;
1574} 1622}
1575 1623
1576sub get_text { 1624sub get_text {
1577 $_[0]{text} 1625 $_[0]{text}
1578} 1626}
… …
1611 } elsif ($uni) { 1659 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1613 } 1661 }
1614 1662
1615 $self->_set_text ($text); 1663 $self->_set_text ($text);
1616 $self->update; 1664
1617 $self->check_size; 1665 $self->realloc;
1618} 1666}
1619 1667
1620sub focus_in { 1668sub focus_in {
1621 my ($self) = @_; 1669 my ($self) = @_;
1622 1670
… …
2129 $self->update; 2177 $self->update;
2130 2178
2131 $self 2179 $self
2132} 2180}
2133 2181
2182sub changed { }
2183
2134sub set_range { 2184sub set_range {
2135 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2136 2186
2137 $self->{range} = $range; 2187 ($range, $self->{range}) = ($self->{range}, $range);
2138 2188
2139 $self->update; 2189 $self->update
2190 if "@$range" ne "@{$self->{range}}";
2140} 2191}
2141 2192
2142sub set_value { 2193sub set_value {
2143 my ($self, $value) = @_; 2194 my ($self, $value) = @_;
2144 2195
… …
2326 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2327 $self->reflow; 2378 $self->reflow;
2328} 2379}
2329 2380
2330sub size_allocate { 2381sub size_allocate {
2331 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2332 2383
2333 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2334 2387
2335 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2338 2391
… …
2527 2580
2528sub new { 2581sub new {
2529 my $class = shift; 2582 my $class = shift;
2530 2583
2531 my $self = $class->SUPER::new ( 2584 my $self = $class->SUPER::new (
2532 state => 0, 2585 state => 0,
2533 connect_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2534 @_ 2587 @_
2535 ); 2588 );
2536 2589
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2590 $self
2543} 2591}
2544 2592
2545sub toggle_flopper { 2593sub toggle_flopper {
2546 my ($self) = @_; 2594 my ($self) = @_;
2547 2595
2548 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2597}
2560 2598
2561############################################################################# 2599#############################################################################
2562 2600
2563package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2595 2633
2596 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2597} 2635}
2598 2636
2599sub size_allocate { 2637sub size_allocate {
2600 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2601 2639
2640 return unless $changed;
2641
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2603} 2643}
2604 2644
2605sub _draw { 2645sub _draw {
2606 my ($self) = @_; 2646 my ($self) = @_;
2607 2647
… …
2747 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2748 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2749 2789
2750 $row++; 2790 $row++;
2751 } 2791 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759} 2792}
2760 2793
2761############################################################################# 2794#############################################################################
2762 2795
2763package CFClient::UI::Menu; 2796package CFClient::UI::Menu;
… …
2949use CFClient::OpenGL; 2982use CFClient::OpenGL;
2950 2983
2951sub new { 2984sub new {
2952 my $class = shift; 2985 my $class = shift;
2953 2986
2954 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
2988 visible => 1,
2955 @_, 2989 @_,
2956 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
2957} 2995}
2958 2996
2959sub configure { 2997sub configure {
2960 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
2961 2999
2962 $self->{w} = $w; 3000 $self->{w} = $w;
2963 $self->{h} = $h; 3001 $self->{h} = $h;
2964} 3002}
2965 3003
2966sub check_size { 3004sub reconfigure {
2967 my ($self) = @_; 3005 my ($self) = @_;
2968 3006
3007 $self->SUPER::reconfigure;
3008
2969 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
2970 if $self->{w}; 3010 if $self->{w};
2971} 3011}
2972 3012
2973sub size_request { 3013sub size_request {
2974 my ($self) = @_; 3014 my ($self) = @_;
2975 3015
2976 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
2977} 3017}
2978 3018
2979sub size_allocate { 3019sub size_allocate {
2980 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
2981 3021
2982 for my $child ($self->children) { 3022 for my $child ($self->children) {
2983 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)};
2984 3024
2985 $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
2986 if exists $child->{req_x}; 3026 if exists $child->{req_x};
2987 3027
2988 $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
2989 if exists $child->{req_y}; 3029 if exists $child->{req_y};
2990 3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
2991 $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;
2992 $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;
2993 3035
2994 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
2995 } 3037 }
… …
3008} 3050}
3009 3051
3010sub update { 3052sub update {
3011 my ($self) = @_; 3053 my ($self) = @_;
3012 3054
3013 $self->check_size;
3014 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
3015} 3056}
3016 3057
3017sub add { 3058sub add {
3018 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
3019
3020 for (my @widgets = @children; my $w = pop @widgets; ) {
3021 push @widgets, $w->children;
3022 $w->{root} = $self;
3023 $w->{visible} = 1;
3024 }
3025 3060
3026 for my $child (@children) { 3061 for my $child (@children) {
3027 $child->{is_toplevel} = 1; 3062 $child->{is_toplevel} = 1;
3028 3063
3029 # integerise window positions 3064 # integerise window positions
… …
3064 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
3065 $_->() 3100 $_->()
3066 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
3067 } 3102 }
3068 3103
3069 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
3070 my @queue = ([], []); 3105 my @queue;
3071 3106
3072 for (;;) { 3107 while () {
3073 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
3074 # heuristic: check containers last 3109 #TODO use array-of-depth approach
3075 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3110
3076 for values %{delete $self->{check_size}} 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3112 @queue, values %{delete $self->{realloc}};
3077 } 3113 }
3078 3114
3079 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3115 my $widget = pop @queue || last;
3080 3116
3117 $widget->{visible} or last; # do not resize invisible widgets
3118
3081 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3082 ? @$widget{qw(user_w user_h)} 3120 ? @$widget{qw(def_w def_h)}
3083 : $widget->size_request; 3121 : $widget->size_request;
3084 3122
3085 if (delete $widget->{force_alloc}
3086 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3087 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#
3088 3124
3089 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
3090 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
3091 3127
3092 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3093 3129
3094 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
3095 if $widget->{parent}; 3131 if $widget->{parent};
3096 }
3097 } 3132 }
3098 } 3133 }
3099 3134
3100 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
3101 for (values %{delete $self->{size_alloc}}) { 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3102 my ($widget, $w, $h) = @$_; 3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3103 3141
3104 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
3105 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
3106 3144
3107 $widget->{w} = $w; 3145 $widget->{w} = $w;
3108 $widget->{h} = $h; 3146 $widget->{h} = $h;
3109 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
3110 } 3148 }
3111 } 3149 }
3112 3150
3113 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
3114 $_->() 3152 $_->()

Diff Legend

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