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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 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 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31 }
32
33 $layout
34}
35
36sub set_layout {
37 my ($layout) = @_;
38 $LAYOUT = $layout;
39}
18 40
19sub check_tooltip { 41sub check_tooltip {
20 if (!$GRAB) { 42 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
23 45
24 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
25 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
26 50
27 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
28 52
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 54
31 $TOOLTIP->set_tooltip_from ($widget); 55 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 56 $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 } 57 }
43 58
44 return; 59 return;
45 } 60 }
46 } 61 }
… …
152sub rescale_widgets { 167sub rescale_widgets {
153 my ($sx, $sy) = @_; 168 my ($sx, $sy) = @_;
154 169
155 for my $widget (values %WIDGET) { 170 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 171 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 176 $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}; 177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_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}; 178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 179 $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}; 180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 181
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184
165 } 185 }
166 } 186 }
167 187
168 reconfigure_widgets; 188 reconfigure_widgets;
169} 189}
… …
178 198
179sub new { 199sub new {
180 my $class = shift; 200 my $class = shift;
181 201
182 my $self = bless { 202 my $self = bless {
183 x => 0, 203 x => "center",
184 y => 0, 204 y => "center",
185 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
186 can_events => 1, 208 can_events => 1,
187 @_ 209 @_
188 }, $class; 210 }, $class;
189 211
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223
190 for (keys %$self) { 224 for (keys %$self) {
191 if (/^connect_(.*)$/) { 225 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
193 } 227 }
194 } 228 }
195 229
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
198 $self 230 $self
199} 231}
200 232
201sub destroy { 233sub destroy {
202 my ($self) = @_; 234 my ($self) = @_;
… …
205 %$self = (); 237 %$self = ();
206} 238}
207 239
208sub show { 240sub show {
209 my ($self) = @_; 241 my ($self) = @_;
242
210 return if $self->{parent}; 243 return if $self->{parent};
211 244
212 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
213} 246}
214 247
215sub show_centered { 248sub set_visible {
216 my ($self) = @_; 249 my ($self) = @_;
250
217 return if $self->{parent}; 251 return if $self->{visible};
218 252
219 $self->show; 253 $self->{root} = $self->{parent}{root};
254 $self->{visible} = $self->{parent}{visible} + 1;
220 255
221 $CFClient::UI::ROOT->on_post_alloc ( 256 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 257
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 258 $self->realloc if !exists $self->{req_w};
224 }, 259
225 ); 260 $_->set_visible for $self->children;
226} 261}
227 262
228sub set_invisible { 263sub set_invisible {
229 my ($self) = @_; 264 my ($self) = @_;
230 265
231 # broken show/hide model 266 return unless $self->{visible};
232 267
268 $_->set_invisible for $self->children;
269
270 delete $self->{root};
233 delete $self->{visible}; 271 delete $self->{visible};
234 272
235 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
237 275
238 CFClient::UI::check_tooltip 276 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 277 if $TOOLTIP->{owner} == $self;
240 278
241 $self->focus_out; 279 $self->focus_out;
280
281 $self->emit (visibility_change => 0);
282}
283
284sub set_visibility {
285 my ($self, $visible) = @_;
286
287 return if $self->{visible} == $visible;
288
289 $visible ? $self->hide
290 : $self->show;
291}
292
293sub toggle_visibility {
294 my ($self) = @_;
295
296 $self->{visible}
297 ? $self->hide
298 : $self->show;
242} 299}
243 300
244sub hide { 301sub hide {
245 my ($self) = @_; 302 my ($self) = @_;
246 303
… …
248 305
249 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
250 if $self->{parent}; 307 if $self->{parent};
251} 308}
252 309
253sub move { 310sub move_abs {
254 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
255 312
256 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
259 316
260 $self->update; 317 $self->update;
261} 318}
262 319
263sub set_size { 320sub set_size {
264 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
265 322
266 $self->{user_w} = $w; 323 $self->{force_w} = $w;
267 $self->{user_h} = $h; 324 $self->{force_h} = $h;
268 325
269 $self->check_size; 326 $self->realloc;
270} 327}
271 328
272sub size_request { 329sub size_request {
273 require Carp; 330 require Carp;
274 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
276 333
277sub configure { 334sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
279 336
280 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
283 342
284 # use alignment to adjust x, y 343 # use alignment to adjust x, y
285 344
286 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 347 }
291 348
292 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 350 $self->{x} = $x;
294 $self->{y} = $y; 351 $self->{y} = $y;
295 $self->update; 352 $self->update;
296 } 353 }
297 354
298 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 359 }
301} 360}
302 361
303sub size_allocate { 362sub size_allocate {
304 # nothing to be done 363 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 364}
313 365
314sub children { 366sub children {
315} 367}
316 368
… …
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451
452sub find_widget {
453 my ($self, $x, $y) = @_;
454
455 return () unless $self->{can_events};
456
457 return $self
458 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
459 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
460
461 ()
462}
463
464sub set_parent {
465 my ($self, $parent) = @_;
466
467 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible};
470}
471
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc {
496 my ($self) = @_;
497
498 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self};
500
501 $self->{root}{realloc}{$self} = $self;
502 $self->{root}->update;
503 } else {
504 delete $self->{req_w};
505 }
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub reconfigure {
516 my ($self) = @_;
517
518 $self->realloc;
519 $self->update;
520}
399 521
400sub draw { 522sub draw {
401 my ($self) = @_; 523 my ($self) = @_;
402 524
403 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
420 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
421 glEnd; 543 glEnd;
422 glDisable GL_BLEND; 544 glDisable GL_BLEND;
423 } 545 }
424 546
425 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
426 glPushMatrix; 548 glPushMatrix;
427 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
441 my ($self) = @_; 563 my ($self) = @_;
442 564
443 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
444} 566}
445 567
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 { 568sub DESTROY {
507 my ($self) = @_; 569 my ($self) = @_;
508 570
509 delete $WIDGET{$self+0}; 571 delete $WIDGET{$self+0};
510 #$self->deactivate; 572 #$self->deactivate;
… …
566 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
568} 630}
569 631
570sub size_request { 632sub size_request {
571 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
572} 636}
573 637
574sub draw { } 638sub draw { }
575 639
576############################################################################# 640#############################################################################
… …
605 $self->{children} = [ 669 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
608 ]; 672 ];
609 673
610 $self->check_size (1); 674 $self->realloc;
611 $self->update;
612} 675}
613 676
614sub children { 677sub children {
615 @{ $_[0]{children} } 678 @{ $_[0]{children} }
616} 679}
… …
621 delete $child->{parent}; 684 delete $child->{parent};
622 $child->hide; 685 $child->hide;
623 686
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 688
626 $self->check_size (1); 689 $self->realloc;
627 $self->update;
628} 690}
629 691
630sub clear { 692sub clear {
631 my ($self) = @_; 693 my ($self) = @_;
632 694
… …
636 for (@$children) { 698 for (@$children) {
637 delete $_->{parent}; 699 delete $_->{parent};
638 $_->hide; 700 $_->hide;
639 } 701 }
640 702
641 $self->check_size; 703 $self->realloc;
642 $self->update;
643} 704}
644 705
645sub find_widget { 706sub find_widget {
646 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
647 708
… …
700sub size_request { 761sub size_request {
701 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
702} 763}
703 764
704sub size_allocate { 765sub size_allocate {
705 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
706 767
707 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
708} 769}
709 770
710############################################################################# 771#############################################################################
… …
727 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
728 $self->SUPER::update; 789 $self->SUPER::update;
729} 790}
730 791
731sub size_allocate { 792sub size_allocate {
732 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
733 794
734 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
735 $self->update; 796 $self->update
797 if $changed;
736} 798}
737 799
738sub _render { 800sub _render {
739 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
740} 802}
… …
784} 846}
785 847
786sub size_request { 848sub size_request {
787 my ($self) = @_; 849 my ($self) = @_;
788 850
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
790 852
791 @$self{qw(child_w child_h)} 853 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y};
855
856 ($w, $h)
792} 857}
793 858
794sub size_allocate { 859sub size_allocate {
795 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
796 861
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799 864
800 $self->child->configure (0, 0, $w, $h); 865 $self->child->configure (0, 0, $w, $h);
… …
856 my $class = shift; 921 my $class = shift;
857 922
858 my $self; 923 my $self;
859 924
860 my $slider = new CFClient::UI::Slider 925 my $slider = new CFClient::UI::Slider
861 vertical => 1, 926 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 927 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 928 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 929 $self->{vp}->set_offset (0, $_[1]);
865 }, 930 },
866 ; 931 ;
867 932
868 $self = $class->SUPER::new ( 933 $self = $class->SUPER::new (
… …
887 my $child = $self->{vp}->child; 952 my $child = $self->{vp}->child;
888 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
889} 954}
890 955
891sub size_allocate { 956sub size_allocate {
892 my ($self, $w, $h) = @_; 957 my ($self, $w, $h, $changed) = @_;
893 958
894 $self->SUPER::size_allocate ($w, $h); 959 $self->SUPER::size_allocate ($w, $h, $changed);
895 960
896 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
897 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
898} 963}
899 964
… …
946 1011
947our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
948 1013
949use CFClient::OpenGL; 1014use CFClient::OpenGL;
950 1015
951my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954 1023
955sub new { 1024sub new {
956 my $class = shift; 1025 my $class = shift;
957
958 # TODO: user_x, user_y, overwrite moveto?
959 1026
960 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
961 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
962 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
963 border => 0.6, 1030 border => 0.6,
… …
989 $h + $self->border * 2, 1056 $h + $self->border * 2,
990 ) 1057 )
991} 1058}
992 1059
993sub size_allocate { 1060sub size_allocate {
994 my ($self, $w, $h) = @_; 1061 my ($self, $w, $h, $changed) = @_;
1062
1063 return unless $changed;
995 1064
996 $h -= List::Util::max 0, $self->border * 2; 1065 $h -= List::Util::max 0, $self->border * 2;
997 $w -= List::Util::max 0, $self->border * 2; 1066 $w -= List::Util::max 0, $self->border * 2;
998 1067
999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1023 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1024 1093
1025 my $dx = $ev->{x} - $ox; 1094 my $dx = $ev->{x} - $ox;
1026 my $dy = $ev->{y} - $oy; 1095 my $dy = $ev->{y} - $oy;
1027 1096
1028 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099
1100 $self->realloc;
1030 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031 $self->check_size;
1032 }; 1102 };
1033 1103
1034 } elsif ($lr ^ $td) { 1104 } elsif ($lr ^ $td) {
1035 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1105 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036 my ($bx, $by) = ($self->{x}, $self->{y}); 1106 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1038 $self->{motion} = sub { 1108 $self->{motion} = sub {
1039 my ($ev, $x, $y) = @_; 1109 my ($ev, $x, $y) = @_;
1040 1110
1041 ($x, $y) = ($ev->{x}, $ev->{y}); 1111 ($x, $y) = ($ev->{x}, $ev->{y});
1042 1112
1043 $self->move ($bx + $x - $ox, $by + $y - $oy); 1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044 $self->update;
1045 }; 1114 };
1046 } 1115 }
1047} 1116}
1048 1117
1049sub button_up { 1118sub button_up {
… …
1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069 1138
1070 my $border = $self->border; 1139 my $border = $self->border;
1071 1140
1072 glColor @{ $self->{border_bg} }; 1141 glColor @{ $self->{border_bg} };
1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1142 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1143 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1144 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1145 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077 1146
1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1147 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079 my $bg = $tex[0]; 1148 glColor @{ $self->{bg} };
1080 1149
1081 # TODO: repeat texture not scale 1150 # TODO: repeat texture not scale
1151 # solve this better(?)
1082 my $rep_x = $cw / $bg->{w}; 1152 $bg->{s} = $cw / $bg->{w};
1083 my $rep_y = $ch / $bg->{h}; 1153 $bg->{t} = $ch / $bg->{h};
1084
1085 glColor @{ $self->{bg} };
1086
1087 $bg->{s} = $rep_x;
1088 $bg->{t} = $rep_y;
1089 $bg->{wrap_mode} = 1;
1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 } 1155 }
1092 1156
1093 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
1094 1158
… …
1124 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1125 1189
1126 $child->set_parent ($self); 1190 $child->set_parent ($self);
1127 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1128 1192
1129 $self->check_size (1); 1193 $self->realloc;
1130} 1194}
1131 1195
1132# TODO: move to container class maybe? send children a signal on removal? 1196# TODO: move to container class maybe? send children a signal on removal?
1133sub clear { 1197sub clear {
1134 my ($self) = @_; 1198 my ($self) = @_;
… …
1139 for (@children) { 1203 for (@children) {
1140 delete $_->{parent}; 1204 delete $_->{parent};
1141 $_->hide; 1205 $_->hide;
1142 } 1206 }
1143 1207
1144 $self->check_size (1); 1208 $self->realloc;
1145 $self->update;
1146} 1209}
1147 1210
1148sub get_wh { 1211sub get_wh {
1149 my ($self) = @_; 1212 my ($self) = @_;
1150 1213
… …
1177 (sum @$hs), 1240 (sum @$hs),
1178 ) 1241 )
1179} 1242}
1180 1243
1181sub size_allocate { 1244sub size_allocate {
1182 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1183 1246
1184 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1185 1248
1186 my $req_w = (sum @$ws) || 1; 1249 my $req_w = (sum @$ws) || 1;
1187 my $req_h = (sum @$hs) || 1; 1250 my $req_h = (sum @$hs) || 1;
… …
1246 } 1309 }
1247} 1310}
1248 1311
1249############################################################################# 1312#############################################################################
1250 1313
1314package CFClient::UI::Box;
1315
1316our @ISA = CFClient::UI::Container::;
1317
1318sub size_request {
1319 my ($self) = @_;
1320
1321 $self->{vertical}
1322 ? (
1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1325 )
1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1330}
1331
1332sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_;
1334
1335 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children};
1337
1338 my @req;
1339
1340 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children;
1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1355 for 0 .. $#$children;
1356 }
1357 }
1358
1359 CFClient::UI::harmonize \@req;
1360
1361 my $pos = 0;
1362 for (0 .. $#$children) {
1363 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365
1366 $pos += $alloc;
1367 }
1368
1369 1
1370}
1371
1372#############################################################################
1373
1251package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1252 1375
1253# TODO: wrap into common Box base class
1254
1255our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1256 1377
1257sub size_request { 1378sub new {
1258 my ($self) = @_; 1379 my $class = shift;
1259 1380
1260 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1261 1382 vertical => 0,
1262 ( 1383 @_,
1263 (List::Util::sum map $_->[0], @alloc),
1264 (List::Util::max map $_->[1], @alloc),
1265 ) 1384 )
1266} 1385}
1267 1386
1268sub size_allocate {
1269 my ($self, $w, $h) = @_;
1270
1271 ($h, $w) = ($w, $h);
1272
1273 my $children = $self->{children};
1274
1275 my @h = map $_->{req_w}, @$children;
1276
1277 my $req_h = List::Util::sum @h;
1278
1279 if ($req_h > $h) {
1280 # ah well, not enough space
1281 $_ *= $h / $req_h for @h;
1282 } else {
1283 my $exp = List::Util::sum map $_->{expand}, @$children;
1284 $exp ||= 1;
1285
1286 for (0 .. $#$children) {
1287 my $child = $children->[$_];
1288
1289 my $alloc_h = $h[$_];
1290 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291 $h[$_] = $alloc_h;
1292 }
1293 }
1294
1295 CFClient::UI::harmonize \@h;
1296
1297 my $y = 0;
1298 for (0 .. $#$children) {
1299 my $child = $children->[$_];
1300 my $h = $h[$_];
1301 $child->configure ($y, 0, $h, $w);
1302
1303 $y += $h;
1304 }
1305
1306 1
1307}
1308
1309############################################################################# 1387#############################################################################
1310 1388
1311package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1312 1390
1313# TODO: wrap into common Box base class
1314
1315our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1316 1392
1317sub size_request { 1393sub new {
1318 my ($self) = @_; 1394 my $class = shift;
1319 1395
1320 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1321 1397 vertical => 1,
1322 ( 1398 @_,
1323 (List::Util::max map $_->[0], @alloc),
1324 (List::Util::sum map $_->[1], @alloc),
1325 ) 1399 )
1326}
1327
1328sub size_allocate {
1329 my ($self, $w, $h) = @_;
1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333 my $children = $self->{children};
1334
1335 my @h = map $_->{req_h}, @$children;
1336
1337 my $req_h = List::Util::sum @h;
1338
1339 if ($req_h > $h) {
1340 # ah well, not enough space
1341 $_ *= $h / $req_h for @h;
1342 } else {
1343 my $exp = List::Util::sum map $_->{expand}, @$children;
1344 $exp ||= 1;
1345
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348
1349 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@h;
1354
1355 my $y = 0;
1356 for (0 .. $#$children) {
1357 my $child = $children->[$_];
1358 my $h = $h[$_];
1359 $child->configure (0, $y, $w, $h);
1360
1361 $y += $h;
1362 }
1363
1364 1
1365} 1400}
1366 1401
1367############################################################################# 1402#############################################################################
1368 1403
1369package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
1432 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1433 1468
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1436 1471
1472 $self->realloc;
1437 $self->update; 1473 $self->update;
1438 $self->check_size;
1439} 1474}
1440 1475
1441sub set_markup { 1476sub set_markup {
1442 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1443 1478
… …
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448 1483
1449 $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;
1450 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1451 1486
1487 $self->realloc;
1452 $self->update; 1488 $self->update;
1453 $self->check_size;
1454} 1489}
1455 1490
1456sub size_request { 1491sub size_request {
1457 my ($self) = @_; 1492 my ($self) = @_;
1458 1493
… …
1479 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1480 ) 1515 )
1481} 1516}
1482 1517
1483sub size_allocate { 1518sub size_allocate {
1484 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1485 1520
1486 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1487} 1523}
1488 1524
1489sub set_fontsize { 1525sub set_fontsize {
1490 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1491 1527
1492 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1493 delete $self->{texture}; 1529 delete $self->{texture};
1494 1530
1495 $self->update; 1531 $self->realloc;
1496 $self->check_size;
1497} 1532}
1498 1533
1499sub _draw { 1534sub _draw {
1500 my ($self) = @_; 1535 my ($self) = @_;
1501 1536
… …
1581sub set_text { 1616sub set_text {
1582 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1583 1618
1584 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1585 $self->_set_text ($text); 1620 $self->_set_text ($text);
1586 $self->update; 1621
1587 $self->check_size; 1622 $self->realloc;
1588} 1623}
1589 1624
1590sub get_text { 1625sub get_text {
1591 $_[0]{text} 1626 $_[0]{text}
1592} 1627}
… …
1625 } elsif ($uni) { 1660 } elsif ($uni) {
1626 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1627 } 1662 }
1628 1663
1629 $self->_set_text ($text); 1664 $self->_set_text ($text);
1630 $self->update; 1665
1631 $self->check_size; 1666 $self->realloc;
1632} 1667}
1633 1668
1634sub focus_in { 1669sub focus_in {
1635 my ($self) = @_; 1670 my ($self) = @_;
1636 1671
… …
2143 $self->update; 2178 $self->update;
2144 2179
2145 $self 2180 $self
2146} 2181}
2147 2182
2183sub changed { }
2184
2148sub set_range { 2185sub set_range {
2149 my ($self, $range) = @_; 2186 my ($self, $range) = @_;
2150 2187
2151 ($range, $self->{range}) = ($self->{range}, $range); 2188 ($range, $self->{range}) = ($self->{range}, $range);
2152 2189
… …
2341 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2342 $self->reflow; 2379 $self->reflow;
2343} 2380}
2344 2381
2345sub size_allocate { 2382sub size_allocate {
2346 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2347 2384
2348 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2349 2388
2350 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2351 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2353 2392
… …
2542 2581
2543sub new { 2582sub new {
2544 my $class = shift; 2583 my $class = shift;
2545 2584
2546 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2547 state => 0, 2586 state => 0,
2548 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2549 @_ 2588 @_
2550 ); 2589 );
2551 2590
2552 if ($self->{state}) {
2553 $self->{state} = 0;
2554 $self->toggle_flopper;
2555 }
2556
2557 $self 2591 $self
2558} 2592}
2559 2593
2560sub toggle_flopper { 2594sub toggle_flopper {
2561 my ($self) = @_; 2595 my ($self) = @_;
2562 2596
2563 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2564 if ($self->{state} = !$self->{state}) {
2565 $CFClient::UI::ROOT->add ($self->{other});
2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2567 $self->_emit ("open");
2568 } else {
2569 $CFClient::UI::ROOT->remove ($self->{other});
2570 $self->_emit ("close");
2571 }
2572
2573 $self->_emit (changed => $self->{state});
2574} 2598}
2575 2599
2576############################################################################# 2600#############################################################################
2577 2601
2578package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2610 2634
2611 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2612} 2636}
2613 2637
2614sub size_allocate { 2638sub size_allocate {
2615 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2616 2640
2641 return unless $changed;
2642
2617 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2644}
2645
2646sub visibility_change {
2647 my ($self, $visible) = @_;
2648
2649 return unless $visible;
2650
2651 $self->{root}->on_post_alloc ("move_$self" => sub {
2652 my $widget = $self->{owner}
2653 or return;
2654
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH;
2659
2660 $self->move_abs ($x, $y);
2661 });
2618} 2662}
2619 2663
2620sub _draw { 2664sub _draw {
2621 my ($self) = @_; 2665 my ($self) = @_;
2622 2666
… …
2639 glVertex $w, $h; 2683 glVertex $w, $h;
2640 glVertex $w, 0; 2684 glVertex $w, 0;
2641 glEnd; 2685 glEnd;
2642 2686
2643 glTranslate 2 - 0.375, 2 - 0.375; 2687 glTranslate 2 - 0.375, 2 - 0.375;
2688
2644 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2645} 2690}
2646 2691
2647############################################################################# 2692#############################################################################
2648 2693
… …
2762 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2764 2809
2765 $row++; 2810 $row++;
2766 } 2811 }
2767}
2768
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2772} 2812}
2773 2813
2774############################################################################# 2814#############################################################################
2775 2815
2776package CFClient::UI::Menu; 2816package CFClient::UI::Menu;
… …
2962use CFClient::OpenGL; 3002use CFClient::OpenGL;
2963 3003
2964sub new { 3004sub new {
2965 my $class = shift; 3005 my $class = shift;
2966 3006
2967 $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
3008 visible => 1,
2968 @_, 3009 @_,
2969 ) 3010 );
3011
3012 Scalar::Util::weaken ($self->{root} = $self);
3013
3014 $self
2970} 3015}
2971 3016
2972sub configure { 3017sub configure {
2973 my ($self, $x, $y, $w, $h) = @_; 3018 my ($self, $x, $y, $w, $h) = @_;
2974 3019
2975 $self->{w} = $w; 3020 $self->{w} = $w;
2976 $self->{h} = $h; 3021 $self->{h} = $h;
2977} 3022}
2978 3023
2979sub check_size { 3024sub reconfigure {
2980 my ($self) = @_; 3025 my ($self) = @_;
2981 3026
3027 $self->SUPER::reconfigure;
3028
2982 $self->size_allocate ($self->{w}, $self->{h}) 3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
2983 if $self->{w}; 3030 if $self->{w};
2984} 3031}
2985 3032
2986sub size_request { 3033sub size_request {
2987 my ($self) = @_; 3034 my ($self) = @_;
2988 3035
2989 ($self->{w}, $self->{h}) 3036 ($self->{w}, $self->{h})
2990} 3037}
2991 3038
3039sub _to_pixel {
3040 my ($coord, $size, $max) = @_;
3041
3042 $coord =
3043 $coord eq "center" ? ($max - $size) * 0.5
3044 : $coord eq "max" ? $max
3045 : $coord;
3046
3047 $coord = 0 if $coord < 0;
3048 $coord = $max - $size if $coord > $max - $size;
3049
3050 int $coord + 0.5
3051}
3052
2992sub size_allocate { 3053sub size_allocate {
2993 my ($self, $w, $h) = @_; 3054 my ($self, $w, $h, $changed) = @_;
2994 3055
2995 for my $child ($self->children) { 3056 for my $child ($self->children) {
2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997 3058
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3059 $X = $child->{force_x} if exists $child->{force_x};
2999 if exists $child->{req_x}; 3060 $Y = $child->{force_y} if exists $child->{force_y};
3000 3061
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3062 $X = _to_pixel $X, $W, $self->{w};
3002 if exists $child->{req_y}; 3063 $Y = _to_pixel $Y, $H, $self->{h};
3003
3004 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006 3064
3007 $child->configure ($X, $Y, $W, $H); 3065 $child->configure ($X, $Y, $W, $H);
3008 } 3066 }
3009} 3067}
3010 3068
… …
3021} 3079}
3022 3080
3023sub update { 3081sub update {
3024 my ($self) = @_; 3082 my ($self) = @_;
3025 3083
3026 $self->check_size;
3027 $::WANT_REFRESH++; 3084 $::WANT_REFRESH++;
3028} 3085}
3029 3086
3030sub add { 3087sub add {
3031 my ($self, @children) = @_; 3088 my ($self, @children) = @_;
3032 3089
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1; 3090 $_->{is_toplevel} = 1
3041 3091 for @children;
3042 # integerise window positions
3043 $child->{x} = int $child->{x};
3044 $child->{y} = int $child->{y};
3045 }
3046 3092
3047 $self->SUPER::add (@children); 3093 $self->SUPER::add (@children);
3048} 3094}
3049 3095
3050sub remove { 3096sub remove {
3051 my ($self, @children) = @_; 3097 my ($self, @children) = @_;
3052 3098
3053 $self->SUPER::remove (@children); 3099 $self->SUPER::remove (@children);
3100
3101 delete $self->{is_toplevel}
3102 for @children;
3054 3103
3055 while (@children) { 3104 while (@children) {
3056 my $w = pop @children; 3105 my $w = pop @children;
3057 push @children, $w->children; 3106 push @children, $w->children;
3058 $w->set_invisible; 3107 $w->set_invisible;
… …
3077 while ($self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
3078 $_->() 3127 $_->()
3079 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
3080 } 3129 }
3081 3130
3082 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3083 my @queue = ([], []); 3132 my @queue;
3084 3133
3085 for (;;) { 3134 while () {
3086 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
3087 # heuristic: check containers last 3136 #TODO use array-of-depth approach
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3137
3089 for values %{delete $self->{check_size}} 3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3139 @queue, values %{delete $self->{realloc}};
3090 } 3140 }
3091 3141
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3142 my $widget = pop @queue || last;
3093 3143
3144 $widget->{visible} or last; # do not resize invisible widgets
3145
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3095 ? @$widget{qw(user_w user_h)} 3147 ? @$widget{qw(force_w force_h)}
3096 : $widget->size_request; 3148 : $widget->size_request;
3097 3149
3098 if (delete $widget->{force_alloc} 3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3151
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3152 $w = $min_size if $w < $min_size;
3101 3153 $h = $min_size if $h < $min_size;
3154
3102 $widget->{req_w} = $w; 3155 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h; 3156 $widget->{req_h} = $h;
3104 3157
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3106 3159
3107 $widget->{parent}->check_size 3160 push @queue, $widget->{parent}
3108 if $widget->{parent}; 3161 if $widget->{parent};
3109 }
3110 } 3162 }
3111 } 3163 }
3112 3164
3113 while ($self->{size_alloc}) { 3165 while (my $size_alloc = delete $self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) { 3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3115 my ($widget, $w, $h) = @$_; 3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3116 3174
3117 $w = 0 if $w < 0; 3175 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0; 3176 $h = 0 if $h < 0;
3119 3177
3178 $w = int $w + 0.5;
3179 $h = int $h + 0.5;
3180
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3182
3120 $widget->{w} = $w; 3183 $widget->{w} = $w;
3121 $widget->{h} = $h; 3184 $widget->{h} = $h;
3185
3122 $widget->emit (size_allocate => $w, $h); 3186 $widget->emit (size_allocate => $w, $h, $changed);
3123 } 3187 }
3124 } 3188 }
3125 3189
3126 while ($self->{post_alloc_hook}) { 3190 while ($self->{post_alloc_hook}) {
3127 $_->() 3191 $_->()

Diff Legend

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