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.256 by root, Tue May 30 01:42:16 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 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};
29 } 31 }
30 32
31 return $LAYOUT; 33 $layout
32} 34}
33 35
34sub set_layout { 36sub set_layout {
35 my ($layout) = @_; 37 my ($layout) = @_;
36 $LAYOUT = $layout; 38 $LAYOUT = $layout;
… …
40 if (!$GRAB) { 42 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
43 45
44 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
45 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
46 50
47 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
48 52
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 54
51 $TOOLTIP->set_tooltip_from ($widget); 55 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 56 $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 } 57 }
63 58
64 return; 59 return;
65 } 60 }
66 } 61 }
… …
172sub rescale_widgets { 167sub rescale_widgets {
173 my ($sx, $sy) = @_; 168 my ($sx, $sy) = @_;
174 169
175 for my $widget (values %WIDGET) { 170 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
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}; 178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $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};
183 $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};
184 $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
185 } 185 }
186 } 186 }
187 187
188 reconfigure_widgets; 188 reconfigure_widgets;
189} 189}
… …
198 198
199sub new { 199sub new {
200 my $class = shift; 200 my $class = shift;
201 201
202 my $self = bless { 202 my $self = bless {
203 x => 0, 203 x => "center",
204 y => 0, 204 y => "center",
205 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
206 can_events => 1, 208 can_events => 1,
207 @_ 209 @_
208 }, $class; 210 }, $class;
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);
209 223
210 for (keys %$self) { 224 for (keys %$self) {
211 if (/^on_(.*)$/) { 225 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
213 } 227 }
214 } 228 }
215 229
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
225 $self 230 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 231}
237 232
238sub destroy { 233sub destroy {
239 my ($self) = @_; 234 my ($self) = @_;
240 235
… …
242 %$self = (); 237 %$self = ();
243} 238}
244 239
245sub show { 240sub show {
246 my ($self) = @_; 241 my ($self) = @_;
242
247 return if $self->{parent}; 243 return if $self->{parent};
248 244
249 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
250} 246}
251 247
252sub show_centered { 248sub set_visible {
253 my ($self) = @_; 249 my ($self) = @_;
250
254 return if $self->{parent}; 251 return if $self->{visible};
255 252
256 $self->show; 253 $self->{root} = $self->{parent}{root};
254 $self->{visible} = $self->{parent}{visible} + 1;
257 255
258 $CFClient::UI::ROOT->on_post_alloc ( 256 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 257
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 258 $self->realloc if !exists $self->{req_w};
261 }, 259
262 ); 260 $_->set_visible for $self->children;
263} 261}
264 262
265sub set_invisible { 263sub set_invisible {
266 my ($self) = @_; 264 my ($self) = @_;
267 265
268 return unless $self->{visible}; 266 return unless $self->{visible};
269 267
270 # broken show/hide model 268 $_->set_invisible for $self->children;
271 269
272 delete $self->{root}; 270 delete $self->{root};
273 delete $self->{visible}; 271 delete $self->{visible};
274 272
275 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
277 275
278 CFClient::UI::check_tooltip 276 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 277 if $TOOLTIP->{owner} == $self;
280 278
281 $self->focus_out; 279 $self->focus_out;
282 280
283 $self->emit (visibility_change => 0); 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;
284} 299}
285 300
286sub hide { 301sub hide {
287 my ($self) = @_; 302 my ($self) = @_;
288 303
… …
290 305
291 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
292 if $self->{parent}; 307 if $self->{parent};
293} 308}
294 309
295sub move { 310sub move_abs {
296 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
297 312
298 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
299 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
300 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
301 316
302 $self->update; 317 $self->update;
303} 318}
304 319
305sub set_size { 320sub set_size {
306 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
307 322
308 $self->{user_w} = $w; 323 $self->{force_w} = $w;
309 $self->{user_h} = $h; 324 $self->{force_h} = $h;
310 325
311 $self->check_size; 326 $self->realloc;
312} 327}
313 328
314sub size_request { 329sub size_request {
315 require Carp; 330 require Carp;
316 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
318 333
319sub configure { 334sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
321 336
322 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
325 342
326 # use alignment to adjust x, y 343 # use alignment to adjust x, y
327 344
328 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 347 }
333 348
334 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 350 $self->{x} = $x;
336 $self->{y} = $y; 351 $self->{y} = $y;
337 $self->update; 352 $self->update;
338 } 353 }
339 354
340 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
342 } 359 }
343} 360}
344 361
345sub size_allocate { 362sub size_allocate {
346 # nothing to be done 363 # nothing to be done
347}
348
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354} 364}
355 365
356sub children { 366sub children {
357} 367}
358 368
… …
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
440sub 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}
441 521
442sub draw { 522sub draw {
443 my ($self) = @_; 523 my ($self) = @_;
444 524
445 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
462 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
463 glEnd; 543 glEnd;
464 glDisable GL_BLEND; 544 glDisable GL_BLEND;
465 } 545 }
466 546
467 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
468 glPushMatrix; 548 glPushMatrix;
469 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
471 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
483 my ($self) = @_; 563 my ($self) = @_;
484 564
485 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
486} 566}
487 567
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 { 568sub DESTROY {
558 my ($self) = @_; 569 my ($self) = @_;
559 570
560 delete $WIDGET{$self+0}; 571 delete $WIDGET{$self+0};
561 #$self->deactivate; 572 #$self->deactivate;
… …
617 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
619} 630}
620 631
621sub size_request { 632sub size_request {
622 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
623} 636}
624 637
625sub draw { } 638sub draw { }
626 639
627############################################################################# 640#############################################################################
… …
656 $self->{children} = [ 669 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
659 ]; 672 ];
660 673
661 $self->check_size (1); 674 $self->realloc;
662 $self->update;
663} 675}
664 676
665sub children { 677sub children {
666 @{ $_[0]{children} } 678 @{ $_[0]{children} }
667} 679}
… …
672 delete $child->{parent}; 684 delete $child->{parent};
673 $child->hide; 685 $child->hide;
674 686
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 688
677 $self->check_size (1); 689 $self->realloc;
678 $self->update;
679} 690}
680 691
681sub clear { 692sub clear {
682 my ($self) = @_; 693 my ($self) = @_;
683 694
… …
687 for (@$children) { 698 for (@$children) {
688 delete $_->{parent}; 699 delete $_->{parent};
689 $_->hide; 700 $_->hide;
690 } 701 }
691 702
692 $self->check_size; 703 $self->realloc;
693 $self->update;
694} 704}
695 705
696sub find_widget { 706sub find_widget {
697 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
698 708
… …
751sub size_request { 761sub size_request {
752 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
753} 763}
754 764
755sub size_allocate { 765sub size_allocate {
756 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
757 767
758 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
759} 769}
760 770
761############################################################################# 771#############################################################################
… …
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 789 $self->SUPER::update;
780} 790}
781 791
782sub size_allocate { 792sub size_allocate {
783 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
784 794
785 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
786 $self->update; 796 $self->update
797 if $changed;
787} 798}
788 799
789sub _render { 800sub _render {
790 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
791} 802}
… …
835} 846}
836 847
837sub size_request { 848sub size_request {
838 my ($self) = @_; 849 my ($self) = @_;
839 850
840 @$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)};
841 852
842 @$self{qw(child_w child_h)} 853 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y};
855
856 ($w, $h)
843} 857}
844 858
845sub size_allocate { 859sub size_allocate {
846 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
847 861
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850 864
851 $self->child->configure (0, 0, $w, $h); 865 $self->child->configure (0, 0, $w, $h);
… …
938 my $child = $self->{vp}->child; 952 my $child = $self->{vp}->child;
939 $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]);
940} 954}
941 955
942sub size_allocate { 956sub size_allocate {
943 my ($self, $w, $h) = @_; 957 my ($self, $w, $h, $changed) = @_;
944 958
945 $self->SUPER::size_allocate ($w, $h); 959 $self->SUPER::size_allocate ($w, $h, $changed);
946 960
947 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
948 $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]);
949} 963}
950 964
… …
997 1011
998our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
999 1013
1000use CFClient::OpenGL; 1014use CFClient::OpenGL;
1001 1015
1002my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 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); 1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1023
1006sub new { 1024sub new {
1007 my $class = shift; 1025 my $class = shift;
1008
1009 # TODO: user_x, user_y, overwrite moveto?
1010 1026
1011 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1030 border => 0.6,
… …
1040 $h + $self->border * 2, 1056 $h + $self->border * 2,
1041 ) 1057 )
1042} 1058}
1043 1059
1044sub size_allocate { 1060sub size_allocate {
1045 my ($self, $w, $h) = @_; 1061 my ($self, $w, $h, $changed) = @_;
1062
1063 return unless $changed;
1046 1064
1047 $h -= List::Util::max 0, $self->border * 2; 1065 $h -= List::Util::max 0, $self->border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1066 $w -= List::Util::max 0, $self->border * 2;
1049 1067
1050 $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)
… …
1074 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1075 1093
1076 my $dx = $ev->{x} - $ox; 1094 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1095 my $dy = $ev->{y} - $oy;
1078 1096
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1099
1084 $self->check_size; 1100 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085 }; 1102 };
1086 1103
1087 } elsif ($lr ^ $td) { 1104 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1105 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1106 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1108 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1109 my ($ev, $x, $y) = @_;
1093 1110
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1111 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1112
1096 $self->{user_x} = $bx + $x - $ox; 1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy;
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1114 };
1101 } 1115 }
1102} 1116}
1103 1117
1104sub button_up { 1118sub button_up {
… …
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1138
1125 my $border = $self->border; 1139 my $border = $self->border;
1126 1140
1127 glColor @{ $self->{border_bg} }; 1141 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1142 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1143 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1144 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1145 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1146
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1147 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1148 glColor @{ $self->{bg} };
1135 1149
1136 # TODO: repeat texture not scale 1150 # TODO: repeat texture not scale
1151 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1152 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1153 $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); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1155 }
1147 1156
1148 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
1149 1158
… …
1179 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1180 1189
1181 $child->set_parent ($self); 1190 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1183 1192
1184 $self->check_size (1); 1193 $self->realloc;
1185} 1194}
1186 1195
1187# 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?
1188sub clear { 1197sub clear {
1189 my ($self) = @_; 1198 my ($self) = @_;
… …
1194 for (@children) { 1203 for (@children) {
1195 delete $_->{parent}; 1204 delete $_->{parent};
1196 $_->hide; 1205 $_->hide;
1197 } 1206 }
1198 1207
1199 $self->check_size (1); 1208 $self->realloc;
1200 $self->update;
1201} 1209}
1202 1210
1203sub get_wh { 1211sub get_wh {
1204 my ($self) = @_; 1212 my ($self) = @_;
1205 1213
… …
1232 (sum @$hs), 1240 (sum @$hs),
1233 ) 1241 )
1234} 1242}
1235 1243
1236sub size_allocate { 1244sub size_allocate {
1237 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1238 1246
1239 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1240 1248
1241 my $req_w = (sum @$ws) || 1; 1249 my $req_w = (sum @$ws) || 1;
1242 my $req_h = (sum @$hs) || 1; 1250 my $req_h = (sum @$hs) || 1;
… …
1301 } 1309 }
1302} 1310}
1303 1311
1304############################################################################# 1312#############################################################################
1305 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
1306package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1307 1375
1308# TODO: wrap into common Box base class
1309
1310our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1311 1377
1312sub size_request { 1378sub new {
1313 my ($self) = @_; 1379 my $class = shift;
1314 1380
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1316 1382 vertical => 0,
1317 ( 1383 @_,
1318 (List::Util::sum map $_->[0], @alloc),
1319 (List::Util::max map $_->[1], @alloc),
1320 ) 1384 )
1321} 1385}
1322 1386
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############################################################################# 1387#############################################################################
1365 1388
1366package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1367 1390
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1371 1392
1372sub size_request { 1393sub new {
1373 my ($self) = @_; 1394 my $class = shift;
1374 1395
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1376 1397 vertical => 1,
1377 ( 1398 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1399 )
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} 1400}
1421 1401
1422############################################################################# 1402#############################################################################
1423 1403
1424package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
1487 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1488 1468
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1491 1471
1472 $self->realloc;
1492 $self->update; 1473 $self->update;
1493 $self->check_size;
1494} 1474}
1495 1475
1496sub set_markup { 1476sub set_markup {
1497 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1498 1478
… …
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1483
1504 $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;
1505 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1506 1486
1487 $self->realloc;
1507 $self->update; 1488 $self->update;
1508 $self->check_size;
1509} 1489}
1510 1490
1511sub size_request { 1491sub size_request {
1512 my ($self) = @_; 1492 my ($self) = @_;
1513 1493
… …
1534 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1535 ) 1515 )
1536} 1516}
1537 1517
1538sub size_allocate { 1518sub size_allocate {
1539 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1540 1520
1541 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1542} 1523}
1543 1524
1544sub set_fontsize { 1525sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1546 1527
1547 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1529 delete $self->{texture};
1549 1530
1550 $self->update; 1531 $self->realloc;
1551 $self->check_size;
1552} 1532}
1553 1533
1554sub _draw { 1534sub _draw {
1555 my ($self) = @_; 1535 my ($self) = @_;
1556 1536
… …
1636sub set_text { 1616sub set_text {
1637 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1638 1618
1639 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1620 $self->_set_text ($text);
1641 $self->update; 1621
1642 $self->check_size; 1622 $self->realloc;
1643} 1623}
1644 1624
1645sub get_text { 1625sub get_text {
1646 $_[0]{text} 1626 $_[0]{text}
1647} 1627}
… …
1680 } elsif ($uni) { 1660 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1682 } 1662 }
1683 1663
1684 $self->_set_text ($text); 1664 $self->_set_text ($text);
1685 $self->update; 1665
1686 $self->check_size; 1666 $self->realloc;
1687} 1667}
1688 1668
1689sub focus_in { 1669sub focus_in {
1690 my ($self) = @_; 1670 my ($self) = @_;
1691 1671
… …
2198 $self->update; 2178 $self->update;
2199 2179
2200 $self 2180 $self
2201} 2181}
2202 2182
2183sub changed { }
2184
2203sub set_range { 2185sub set_range {
2204 my ($self, $range) = @_; 2186 my ($self, $range) = @_;
2205 2187
2206 ($range, $self->{range}) = ($self->{range}, $range); 2188 ($range, $self->{range}) = ($self->{range}, $range);
2207 2189
… …
2396 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2397 $self->reflow; 2379 $self->reflow;
2398} 2380}
2399 2381
2400sub size_allocate { 2382sub size_allocate {
2401 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2402 2384
2403 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2404 2388
2405 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2408 2392
… …
2650 2634
2651 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2652} 2636}
2653 2637
2654sub size_allocate { 2638sub size_allocate {
2655 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2656 2640
2641 return unless $changed;
2642
2657 $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 });
2658} 2662}
2659 2663
2660sub _draw { 2664sub _draw {
2661 my ($self) = @_; 2665 my ($self) = @_;
2662 2666
… …
2679 glVertex $w, $h; 2683 glVertex $w, $h;
2680 glVertex $w, 0; 2684 glVertex $w, 0;
2681 glEnd; 2685 glEnd;
2682 2686
2683 glTranslate 2 - 0.375, 2 - 0.375; 2687 glTranslate 2 - 0.375, 2 - 0.375;
2688
2684 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2685} 2690}
2686 2691
2687############################################################################# 2692#############################################################################
2688 2693
… …
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804 2809
2805 $row++; 2810 $row++;
2806 } 2811 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812} 2812}
2813 2813
2814############################################################################# 2814#############################################################################
2815 2815
2816package CFClient::UI::Menu; 2816package CFClient::UI::Menu;
… …
3002use CFClient::OpenGL; 3002use CFClient::OpenGL;
3003 3003
3004sub new { 3004sub new {
3005 my $class = shift; 3005 my $class = shift;
3006 3006
3007 $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
3008 visible => 1, 3008 visible => 1,
3009 @_, 3009 @_,
3010 ) 3010 );
3011
3012 Scalar::Util::weaken ($self->{root} = $self);
3013
3014 $self
3011} 3015}
3012 3016
3013sub configure { 3017sub configure {
3014 my ($self, $x, $y, $w, $h) = @_; 3018 my ($self, $x, $y, $w, $h) = @_;
3015 3019
3016 $self->{w} = $w; 3020 $self->{w} = $w;
3017 $self->{h} = $h; 3021 $self->{h} = $h;
3018} 3022}
3019 3023
3020sub check_size { 3024sub reconfigure {
3021 my ($self) = @_; 3025 my ($self) = @_;
3022 3026
3027 $self->SUPER::reconfigure;
3028
3023 $self->size_allocate ($self->{w}, $self->{h}) 3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w}; 3030 if $self->{w};
3025} 3031}
3026 3032
3027sub size_request { 3033sub size_request {
3028 my ($self) = @_; 3034 my ($self) = @_;
3029 3035
3030 ($self->{w}, $self->{h}) 3036 ($self->{w}, $self->{h})
3031} 3037}
3032 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
3033sub size_allocate { 3053sub size_allocate {
3034 my ($self, $w, $h) = @_; 3054 my ($self, $w, $h, $changed) = @_;
3035 3055
3036 for my $child ($self->children) { 3056 for my $child ($self->children) {
3037 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)};
3038 3058
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3059 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3060 $Y = $child->{force_y} if exists $child->{force_y};
3041 3061
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3062 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3063 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $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;
3050 3064
3051 $child->configure ($X, $Y, $W, $H); 3065 $child->configure ($X, $Y, $W, $H);
3052 } 3066 }
3053} 3067}
3054 3068
… …
3065} 3079}
3066 3080
3067sub update { 3081sub update {
3068 my ($self) = @_; 3082 my ($self) = @_;
3069 3083
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3084 $::WANT_REFRESH++;
3072} 3085}
3073 3086
3074sub add { 3087sub add {
3075 my ($self, @children) = @_; 3088 my ($self, @children) = @_;
3076 3089
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
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3090 $_->{is_toplevel} = 1
3085 3091 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3092
3091 $self->SUPER::add (@children); 3093 $self->SUPER::add (@children);
3092} 3094}
3093 3095
3094sub remove { 3096sub remove {
3095 my ($self, @children) = @_; 3097 my ($self, @children) = @_;
3096 3098
3097 $self->SUPER::remove (@children); 3099 $self->SUPER::remove (@children);
3100
3101 delete $self->{is_toplevel}
3102 for @children;
3098 3103
3099 while (@children) { 3104 while (@children) {
3100 my $w = pop @children; 3105 my $w = pop @children;
3101 push @children, $w->children; 3106 push @children, $w->children;
3102 $w->set_invisible; 3107 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
3122 $_->() 3127 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
3124 } 3129 }
3125 3130
3126 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3127 my @queue; 3132 my @queue;
3128 3133
3129 for (;;) { 3134 while () {
3130 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach 3136 #TODO use array-of-depth approach
3132 3137
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3134 @queue, values %{delete $self->{check_size}}; 3139 @queue, values %{delete $self->{realloc}};
3135 } 3140 }
3136 3141
3137 my $widget = pop @queue || last; 3142 my $widget = pop @queue || last;
3138 3143
3139 defined $widget->{visible} or last; # do not resize invisible widgets 3144 $widget->{visible} or last; # do not resize invisible widgets
3140 3145
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3142 ? @$widget{qw(user_w user_h)} 3147 ? @$widget{qw(force_w force_h)}
3143 : $widget->size_request; 3148 : $widget->size_request;
3144 3149
3145 if (delete $widget->{force_alloc} 3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3151
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3152 $w = $min_size if $w < $min_size;
3148 3153 $h = $min_size if $h < $min_size;
3154
3149 $widget->{req_w} = $w; 3155 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3156 $widget->{req_h} = $h;
3151 3157
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3153 3159
3154 $widget->{parent}->check_size 3160 push @queue, $widget->{parent}
3155 if $widget->{parent}; 3161 if $widget->{parent};
3156 }
3157 } 3162 }
3158 } 3163 }
3159 3164
3160 while ($self->{size_alloc}) { 3165 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3162 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;
3163 3174
3164 $w = 0 if $w < 0; 3175 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3176 $h = 0 if $h < 0;
3166 3177
3178 $w = int $w + 0.5;
3179 $h = int $h + 0.5;
3180
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3182
3167 $widget->{w} = $w; 3183 $widget->{w} = $w;
3168 $widget->{h} = $h; 3184 $widget->{h} = $h;
3185
3169 $widget->emit (size_allocate => $w, $h); 3186 $widget->emit (size_allocate => $w, $h, $changed);
3170 } 3187 }
3171 } 3188 }
3172 3189
3173 while ($self->{post_alloc_hook}) { 3190 while ($self->{post_alloc_hook}) {
3174 $_->() 3191 $_->()

Diff Legend

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