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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.255 by root, Mon May 29 02:01:56 2006 UTC

… …
40 if (!$GRAB) { 40 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
43 43
44 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide;
46
45 $TOOLTIP->{owner} = $widget; 47 $TOOLTIP->{owner} = $widget;
46 48
47 my $tip = $widget->{tooltip}; 49 my $tip = $widget->{tooltip};
48 50
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 51 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 52
51 $TOOLTIP->set_tooltip_from ($widget); 53 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 54 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 55 }
63 56
64 return; 57 return;
65 } 58 }
66 } 59 }
… …
175 for my $widget (values %WIDGET) { 168 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 169 if ($widget->{is_toplevel}) {
177 $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};
178 $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};
179 $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};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
185 } 176 }
186 } 177 }
187 178
188 reconfigure_widgets; 179 reconfigure_widgets;
189} 180}
… …
214 } 205 }
215 206
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217 208
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 210 $self->{req_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 211 $self->{req_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 } 214 }
224 215
225 $self 216 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 217}
237 218
238sub destroy { 219sub destroy {
239 my ($self) = @_; 220 my ($self) = @_;
240 221
… …
242 %$self = (); 223 %$self = ();
243} 224}
244 225
245sub show { 226sub show {
246 my ($self) = @_; 227 my ($self) = @_;
228
247 return if $self->{parent}; 229 return if $self->{parent};
248 230
249 $CFClient::UI::ROOT->add ($self); 231 $CFClient::UI::ROOT->add ($self);
250} 232}
251 233
252sub show_centered { 234sub center {
253 my ($self) = @_; 235 my ($self) = @_;
254 return if $self->{parent};
255
256 $self->show;
257 236
258 $CFClient::UI::ROOT->on_post_alloc ( 237 $CFClient::UI::ROOT->on_post_alloc (
259 "centered $self" => sub { 238 "center_$self" => sub {
260 $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);
261 }, 240 },
262 ); 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;
263} 259}
264 260
265sub set_invisible { 261sub set_invisible {
266 my ($self) = @_; 262 my ($self) = @_;
267 263
268 return unless $self->{visible}; 264 return unless $self->{visible};
269 265
270 # broken show/hide model 266 $_->set_invisible for $self->children;
271 267
272 delete $self->{root}; 268 delete $self->{root};
273 delete $self->{visible}; 269 delete $self->{visible};
274 270
275 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 272 undef $HOVER if $HOVER == $self;
277 273
278 CFClient::UI::check_tooltip 274 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 275 if $TOOLTIP->{owner} == $self;
280 276
281 $self->focus_out; 277 $self->focus_out;
282 278
283 $self->emit (visibility_change => 0); 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;
284} 297}
285 298
286sub hide { 299sub hide {
287 my ($self) = @_; 300 my ($self) = @_;
288 301
… …
303} 316}
304 317
305sub set_size { 318sub set_size {
306 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
307 320
308 $self->{user_w} = $w; 321 $self->{def_w} = $w;
309 $self->{user_h} = $h; 322 $self->{def_h} = $h;
310 323
311 $self->check_size; 324 $self->realloc;
312} 325}
313 326
314sub size_request { 327sub size_request {
315 require Carp; 328 require Carp;
316 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
336 $self->{y} = $y; 349 $self->{y} = $y;
337 $self->update; 350 $self->update;
338 } 351 }
339 352
340 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
342 } 357 }
343} 358}
344 359
345sub size_allocate { 360sub size_allocate {
346 # nothing to be done 361 # nothing to be done
347}
348
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354} 362}
355 363
356sub children { 364sub children {
357} 365}
358 366
… …
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
440sub 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}
441 512
442sub draw { 513sub draw {
443 my ($self) = @_; 514 my ($self) = @_;
444 515
445 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
483 my ($self) = @_; 554 my ($self) = @_;
484 555
485 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
486} 557}
487 558
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 559sub DESTROY {
558 my ($self) = @_; 560 my ($self) = @_;
559 561
560 delete $WIDGET{$self+0}; 562 delete $WIDGET{$self+0};
561 #$self->deactivate; 563 #$self->deactivate;
… …
656 $self->{children} = [ 658 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
659 ]; 661 ];
660 662
661 $self->check_size (1); 663 $self->realloc;
662 $self->update;
663} 664}
664 665
665sub children { 666sub children {
666 @{ $_[0]{children} } 667 @{ $_[0]{children} }
667} 668}
… …
672 delete $child->{parent}; 673 delete $child->{parent};
673 $child->hide; 674 $child->hide;
674 675
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 677
677 $self->check_size (1); 678 $self->realloc;
678 $self->update;
679} 679}
680 680
681sub clear { 681sub clear {
682 my ($self) = @_; 682 my ($self) = @_;
683 683
… …
687 for (@$children) { 687 for (@$children) {
688 delete $_->{parent}; 688 delete $_->{parent};
689 $_->hide; 689 $_->hide;
690 } 690 }
691 691
692 $self->check_size; 692 $self->realloc;
693 $self->update;
694} 693}
695 694
696sub find_widget { 695sub find_widget {
697 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
698 697
… …
751sub size_request { 750sub size_request {
752 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
753} 752}
754 753
755sub size_allocate { 754sub size_allocate {
756 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
757 756
758 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
759} 758}
760 759
761############################################################################# 760#############################################################################
… …
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 778 $self->SUPER::update;
780} 779}
781 780
782sub size_allocate { 781sub size_allocate {
783 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
784 783
785 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
786 $self->update; 785 $self->update
786 if $changed;
787} 787}
788 788
789sub _render { 789sub _render {
790 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
791} 791}
… …
835} 835}
836 836
837sub size_request { 837sub size_request {
838 my ($self) = @_; 838 my ($self) = @_;
839 839
840 @$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)};
841 841
842 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
843} 846}
844 847
845sub size_allocate { 848sub size_allocate {
846 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
847 850
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850 853
851 $self->child->configure (0, 0, $w, $h); 854 $self->child->configure (0, 0, $w, $h);
… …
938 my $child = $self->{vp}->child; 941 my $child = $self->{vp}->child;
939 $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]);
940} 943}
941 944
942sub size_allocate { 945sub size_allocate {
943 my ($self, $w, $h) = @_; 946 my ($self, $w, $h, $changed) = @_;
944 947
945 $self->SUPER::size_allocate ($w, $h); 948 $self->SUPER::size_allocate ($w, $h, $changed);
946 949
947 my $child = $self->{vp}->child; 950 my $child = $self->{vp}->child;
948 $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]);
949} 952}
950 953
… …
997 1000
998our @ISA = CFClient::UI::Bin::; 1001our @ISA = CFClient::UI::Bin::;
999 1002
1000use CFClient::OpenGL; 1003use CFClient::OpenGL;
1001 1004
1002my @tex = 1005my $bg =
1006 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1007 mipmap => 1, wrap => 1;
1008
1009my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1011 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1012
1006sub new { 1013sub new {
1007 my $class = shift; 1014 my $class = shift;
1008
1009 # TODO: user_x, user_y, overwrite moveto?
1010 1015
1011 my $self = $class->SUPER::new ( 1016 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1017 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1018 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1019 border => 0.6,
… …
1040 $h + $self->border * 2, 1045 $h + $self->border * 2,
1041 ) 1046 )
1042} 1047}
1043 1048
1044sub size_allocate { 1049sub size_allocate {
1045 my ($self, $w, $h) = @_; 1050 my ($self, $w, $h, $changed) = @_;
1051
1052 return unless $changed;
1046 1053
1047 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
1049 1056
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1076 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
1078 1085
1079 $self->{user_x} = $wx + $dx * $mx; 1086 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my; 1087 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1090 $self->move ($self->{user_x}, $self->{user_y});
1084 $self->check_size; 1091 $self->realloc;
1085 }; 1092 };
1086 1093
1087 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1096 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1093 1100
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1102
1096 $self->{user_x} = $bx + $x - $ox; 1103 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy; 1104 $self->{user_y} = $by + $y - $oy;
1105
1098 $self->move ($self->{user_x}, $self->{user_y}); 1106 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update; 1107 $self->realloc;
1100 }; 1108 };
1101 } 1109 }
1102} 1110}
1103 1111
1104sub button_up { 1112sub button_up {
… …
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1132
1125 my $border = $self->border; 1133 my $border = $self->border;
1126 1134
1127 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1136 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1137 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1138 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1139 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1140
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1142 glColor @{ $self->{bg} };
1135 1143
1136 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
1145 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1146 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1147 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1149 }
1147 1150
1148 glDisable GL_TEXTURE_2D; 1151 glDisable GL_TEXTURE_2D;
1149 1152
… …
1179 my ($self, $x, $y, $child) = @_; 1182 my ($self, $x, $y, $child) = @_;
1180 1183
1181 $child->set_parent ($self); 1184 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1185 $self->{children}[$y][$x] = $child;
1183 1186
1184 $self->check_size (1); 1187 $self->realloc;
1185} 1188}
1186 1189
1187# TODO: move to container class maybe? send children a signal on removal? 1190# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1191sub clear {
1189 my ($self) = @_; 1192 my ($self) = @_;
… …
1194 for (@children) { 1197 for (@children) {
1195 delete $_->{parent}; 1198 delete $_->{parent};
1196 $_->hide; 1199 $_->hide;
1197 } 1200 }
1198 1201
1199 $self->check_size (1); 1202 $self->realloc;
1200 $self->update;
1201} 1203}
1202 1204
1203sub get_wh { 1205sub get_wh {
1204 my ($self) = @_; 1206 my ($self) = @_;
1205 1207
… …
1232 (sum @$hs), 1234 (sum @$hs),
1233 ) 1235 )
1234} 1236}
1235 1237
1236sub size_allocate { 1238sub size_allocate {
1237 my ($self, $w, $h) = @_; 1239 my ($self, $w, $h, $changed) = @_;
1238 1240
1239 my ($ws, $hs) = $self->get_wh; 1241 my ($ws, $hs) = $self->get_wh;
1240 1242
1241 my $req_w = (sum @$ws) || 1; 1243 my $req_w = (sum @$ws) || 1;
1242 my $req_h = (sum @$hs) || 1; 1244 my $req_h = (sum @$hs) || 1;
… …
1301 } 1303 }
1302} 1304}
1303 1305
1304############################################################################# 1306#############################################################################
1305 1307
1308package CFClient::UI::Box;
1309
1310our @ISA = CFClient::UI::Container::;
1311
1312sub size_request {
1313 my ($self) = @_;
1314
1315 $self->{vertical}
1316 ? (
1317 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 )
1320 : (
1321 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 )
1324}
1325
1326sub size_allocate {
1327 my ($self, $w, $h, $changed) = @_;
1328
1329 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children};
1331
1332 my @req;
1333
1334 if ($self->{homogeneous}) {
1335 @req = ($space / (@$children || 1)) x @$children;
1336 } else {
1337 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1338 my $req = List::Util::sum @req;
1339
1340 if ($req > $space) {
1341 # ah well, not enough space
1342 $_ *= $space / $req for @req;
1343 } else {
1344 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1345
1346 $space = ($space - $req) / $expand; # remaining space to give away
1347
1348 $req[$_] += $space * $children->[$_]{expand}
1349 for 0 .. $#$children;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@req;
1354
1355 my $pos = 0;
1356 for (0 .. $#$children) {
1357 my $alloc = $req[$_];
1358 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1359
1360 $pos += $alloc;
1361 }
1362
1363 1
1364}
1365
1366#############################################################################
1367
1306package CFClient::UI::HBox; 1368package CFClient::UI::HBox;
1307 1369
1308# TODO: wrap into common Box base class
1309
1310our @ISA = CFClient::UI::Container::; 1370our @ISA = CFClient::UI::Box::;
1311 1371
1312sub size_request { 1372sub new {
1313 my ($self) = @_; 1373 my $class = shift;
1314 1374
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1375 $class->SUPER::new (
1316 1376 vertical => 0,
1317 ( 1377 @_,
1318 (List::Util::sum map $_->[0], @alloc),
1319 (List::Util::max map $_->[1], @alloc),
1320 ) 1378 )
1321} 1379}
1322 1380
1323sub size_allocate {
1324 my ($self, $w, $h) = @_;
1325
1326 ($h, $w) = ($w, $h);
1327
1328 my $children = $self->{children};
1329
1330 my @h = map $_->{req_w}, @$children;
1331
1332 my $req_h = List::Util::sum @h;
1333
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children;
1339 $exp ||= 1;
1340
1341 for (0 .. $#$children) {
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 }
1348 }
1349
1350 CFClient::UI::harmonize \@h;
1351
1352 my $y = 0;
1353 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_];
1356 $child->configure ($y, 0, $h, $w);
1357
1358 $y += $h;
1359 }
1360
1361 1
1362}
1363
1364############################################################################# 1381#############################################################################
1365 1382
1366package CFClient::UI::VBox; 1383package CFClient::UI::VBox;
1367 1384
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1385our @ISA = CFClient::UI::Box::;
1371 1386
1372sub size_request { 1387sub new {
1373 my ($self) = @_; 1388 my $class = shift;
1374 1389
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1390 $class->SUPER::new (
1376 1391 vertical => 1,
1377 ( 1392 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1393 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1394}
1421 1395
1422############################################################################# 1396#############################################################################
1423 1397
1424package CFClient::UI::Label; 1398package CFClient::UI::Label;
… …
1487 $self->{text} = "T$text"; 1461 $self->{text} = "T$text";
1488 1462
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1464 $self->{layout}->set_text ($text);
1491 1465
1466 $self->realloc;
1492 $self->update; 1467 $self->update;
1493 $self->check_size;
1494} 1468}
1495 1469
1496sub set_markup { 1470sub set_markup {
1497 my ($self, $markup) = @_; 1471 my ($self, $markup) = @_;
1498 1472
… …
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1476 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1477
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1478 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505 $self->{layout}->set_markup ($markup); 1479 $self->{layout}->set_markup ($markup);
1506 1480
1481 $self->realloc;
1507 $self->update; 1482 $self->update;
1508 $self->check_size;
1509} 1483}
1510 1484
1511sub size_request { 1485sub size_request {
1512 my ($self) = @_; 1486 my ($self) = @_;
1513 1487
… …
1534 $h + $self->{padding} * 2, 1508 $h + $self->{padding} * 2,
1535 ) 1509 )
1536} 1510}
1537 1511
1538sub size_allocate { 1512sub size_allocate {
1539 my ($self, $w, $h) = @_; 1513 my ($self, $w, $h, $changed) = @_;
1540 1514
1541 delete $self->{texture}; 1515 delete $self->{texture}
1516 if $changed;
1542} 1517}
1543 1518
1544sub set_fontsize { 1519sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1520 my ($self, $fontsize) = @_;
1546 1521
1547 $self->{fontsize} = $fontsize; 1522 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1523 delete $self->{texture};
1549 1524
1550 $self->update; 1525 $self->realloc;
1551 $self->check_size;
1552} 1526}
1553 1527
1554sub _draw { 1528sub _draw {
1555 my ($self) = @_; 1529 my ($self) = @_;
1556 1530
… …
1636sub set_text { 1610sub set_text {
1637 my ($self, $text) = @_; 1611 my ($self, $text) = @_;
1638 1612
1639 $self->{cursor} = length $text; 1613 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1614 $self->_set_text ($text);
1641 $self->update; 1615
1642 $self->check_size; 1616 $self->realloc;
1643} 1617}
1644 1618
1645sub get_text { 1619sub get_text {
1646 $_[0]{text} 1620 $_[0]{text}
1647} 1621}
… …
1680 } elsif ($uni) { 1654 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1655 substr $text, $self->{cursor}++, 0, chr $uni;
1682 } 1656 }
1683 1657
1684 $self->_set_text ($text); 1658 $self->_set_text ($text);
1685 $self->update; 1659
1686 $self->check_size; 1660 $self->realloc;
1687} 1661}
1688 1662
1689sub focus_in { 1663sub focus_in {
1690 my ($self) = @_; 1664 my ($self) = @_;
1691 1665
… …
2198 $self->update; 2172 $self->update;
2199 2173
2200 $self 2174 $self
2201} 2175}
2202 2176
2177sub changed { }
2178
2203sub set_range { 2179sub set_range {
2204 my ($self, $range) = @_; 2180 my ($self, $range) = @_;
2205 2181
2206 ($range, $self->{range}) = ($self->{range}, $range); 2182 ($range, $self->{range}) = ($self->{range}, $range);
2207 2183
… …
2396 $self->{fontsize} = $fontsize; 2372 $self->{fontsize} = $fontsize;
2397 $self->reflow; 2373 $self->reflow;
2398} 2374}
2399 2375
2400sub size_allocate { 2376sub size_allocate {
2401 my ($self, $w, $h) = @_; 2377 my ($self, $w, $h, $changed) = @_;
2402 2378
2403 $self->SUPER::size_allocate ($w, $h); 2379 $self->SUPER::size_allocate ($w, $h, $changed);
2380
2381 return unless $changed;
2404 2382
2405 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2383 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $self->{layout}->set_width ($self->{children}[0]{w}); 2385 $self->{layout}->set_width ($self->{children}[0]{w});
2408 2386
… …
2650 2628
2651 ($w + 4, $h + 4) 2629 ($w + 4, $h + 4)
2652} 2630}
2653 2631
2654sub size_allocate { 2632sub size_allocate {
2655 my ($self, $w, $h) = @_; 2633 my ($self, $w, $h, $changed) = @_;
2656 2634
2635 return unless $changed;
2636
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2638}
2639
2640sub visibility_change {
2641 my ($self, $visible) = @_;
2642
2643 return unless $visible;
2644
2645 $self->{root}->on_post_alloc ("move_$self" => sub {
2646 my $widget = $self->{owner}
2647 or return;
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 });
2658} 2656}
2659 2657
2660sub _draw { 2658sub _draw {
2661 my ($self) = @_; 2659 my ($self) = @_;
2662 2660
… …
2679 glVertex $w, $h; 2677 glVertex $w, $h;
2680 glVertex $w, 0; 2678 glVertex $w, 0;
2681 glEnd; 2679 glEnd;
2682 2680
2683 glTranslate 2 - 0.375, 2 - 0.375; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2682
2684 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2685} 2684}
2686 2685
2687############################################################################# 2686#############################################################################
2688 2687
… …
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804 2803
2805 $row++; 2804 $row++;
2806 } 2805 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812} 2806}
2813 2807
2814############################################################################# 2808#############################################################################
2815 2809
2816package CFClient::UI::Menu; 2810package CFClient::UI::Menu;
… …
3002use CFClient::OpenGL; 2996use CFClient::OpenGL;
3003 2997
3004sub new { 2998sub new {
3005 my $class = shift; 2999 my $class = shift;
3006 3000
3007 $class->SUPER::new ( 3001 my $self = $class->SUPER::new (
3008 visible => 1, 3002 visible => 1,
3009 @_, 3003 @_,
3010 ) 3004 );
3005
3006 Scalar::Util::weaken ($self->{root} = $self);
3007
3008 $self
3011} 3009}
3012 3010
3013sub configure { 3011sub configure {
3014 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
3015 3013
3016 $self->{w} = $w; 3014 $self->{w} = $w;
3017 $self->{h} = $h; 3015 $self->{h} = $h;
3018} 3016}
3019 3017
3020sub check_size { 3018sub reconfigure {
3021 my ($self) = @_; 3019 my ($self) = @_;
3022 3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}) 3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w}; 3024 if $self->{w};
3025} 3025}
3026 3026
3027sub size_request { 3027sub size_request {
3028 my ($self) = @_; 3028 my ($self) = @_;
3029 3029
3030 ($self->{w}, $self->{h}) 3030 ($self->{w}, $self->{h})
3031} 3031}
3032 3032
3033sub size_allocate { 3033sub size_allocate {
3034 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h, $changed) = @_;
3035 3035
3036 for my $child ($self->children) { 3036 for my $child ($self->children) {
3037 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)};
3038 3038
3039 $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
3040 if exists $child->{req_x}; 3040 if exists $child->{req_x};
3041 3041
3042 $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
3043 if exists $child->{req_y}; 3043 if exists $child->{req_y};
3044 3044
3045 $X = $self->{user_x} if exists $self->{user_x}; 3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047 3046
3048 $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;
3049 $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;
3050 3049
3051 $child->configure ($X, $Y, $W, $H); 3050 $child->configure ($X, $Y, $W, $H);
… …
3065} 3064}
3066 3065
3067sub update { 3066sub update {
3068 my ($self) = @_; 3067 my ($self) = @_;
3069 3068
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3069 $::WANT_REFRESH++;
3072} 3070}
3073 3071
3074sub add { 3072sub add {
3075 my ($self, @children) = @_; 3073 my ($self, @children) = @_;
3076
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082 3074
3083 for my $child (@children) { 3075 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3076 $child->{is_toplevel} = 1;
3085 3077
3086 # integerise window positions 3078 # integerise window positions
… …
3121 while ($self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
3122 $_->() 3114 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3115 for values %{delete $self->{refresh_hook}};
3124 } 3116 }
3125 3117
3126 if ($self->{check_size}) { 3118 if ($self->{realloc}) {
3127 my @queue; 3119 my @queue;
3128 3120
3129 for (;;) { 3121 while () {
3130 if ($self->{check_size}) { 3122 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach 3123 #TODO use array-of-depth approach
3132 3124
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3125 @queue = sort { $a->{visible} <=> $b->{visible} }
3134 @queue, values %{delete $self->{check_size}}; 3126 @queue, values %{delete $self->{realloc}};
3135 } 3127 }
3136 3128
3137 my $widget = pop @queue || last; 3129 my $widget = pop @queue || last;
3138 3130
3139 defined $widget->{visible} or last; # do not resize invisible widgets 3131 $widget->{visible} or last; # do not resize invisible widgets
3140 3132
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3142 ? @$widget{qw(user_w user_h)} 3134 ? @$widget{qw(def_w def_h)}
3143 : $widget->size_request; 3135 : $widget->size_request;
3144 3136
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 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#
3148 3138
3149 $widget->{req_w} = $w; 3139 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3140 $widget->{req_h} = $h;
3151 3141
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3153 3143
3154 $widget->{parent}->check_size 3144 push @queue, $widget->{parent}
3155 if $widget->{parent}; 3145 if $widget->{parent};
3156 }
3157 } 3146 }
3158 } 3147 }
3159 3148
3160 while ($self->{size_alloc}) { 3149 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3162 my ($widget, $w, $h) = @$_; 3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3163 3155
3164 $w = 0 if $w < 0; 3156 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3157 $h = 0 if $h < 0;
3166 3158
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3160
3167 $widget->{w} = $w; 3161 $widget->{w} = $w;
3168 $widget->{h} = $h; 3162 $widget->{h} = $h;
3163
3169 $widget->emit (size_allocate => $w, $h); 3164 $widget->emit (size_allocate => $w, $h, $changed);
3170 } 3165 }
3171 } 3166 }
3172 3167
3173 while ($self->{post_alloc_hook}) { 3168 while ($self->{post_alloc_hook}) {
3174 $_->() 3169 $_->()

Diff Legend

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