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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22:02 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} 231}
227 232
228sub destroy { 233sub destroy {
229 my ($self) = @_; 234 my ($self) = @_;
… …
232 %$self = (); 237 %$self = ();
233} 238}
234 239
235sub show { 240sub show {
236 my ($self) = @_; 241 my ($self) = @_;
242
237 return if $self->{parent}; 243 return if $self->{parent};
238 244
239 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
240} 246}
241 247
242sub show_centered { 248sub set_visible {
243 my ($self) = @_; 249 my ($self) = @_;
250
244 return if $self->{parent}; 251 return if $self->{visible};
245 252
246 $self->show; 253 $self->{root} = $self->{parent}{root};
254 $self->{visible} = $self->{parent}{visible} + 1;
247 255
248 $CFClient::UI::ROOT->on_post_alloc ( 256 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 257
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 258 $self->realloc if !exists $self->{req_w};
251 }, 259
252 ); 260 $_->set_visible for $self->children;
253} 261}
254 262
255sub set_invisible { 263sub set_invisible {
256 my ($self) = @_; 264 my ($self) = @_;
257 265
258 # broken show/hide model 266 return unless $self->{visible};
267
268 $_->set_invisible for $self->children;
259 269
260 delete $self->{root}; 270 delete $self->{root};
261 delete $self->{visible}; 271 delete $self->{visible};
262 272
263 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
265 275
266 CFClient::UI::check_tooltip 276 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 277 if $TOOLTIP->{owner} == $self;
268 278
269 $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;
270} 299}
271 300
272sub hide { 301sub hide {
273 my ($self) = @_; 302 my ($self) = @_;
274 303
… …
276 305
277 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
278 if $self->{parent}; 307 if $self->{parent};
279} 308}
280 309
281sub move { 310sub move_abs {
282 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
283 312
284 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
287 316
288 $self->update; 317 $self->update;
289} 318}
290 319
291sub set_size { 320sub set_size {
292 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
293 322
294 $self->{user_w} = $w; 323 $self->{force_w} = $w;
295 $self->{user_h} = $h; 324 $self->{force_h} = $h;
296 325
297 $self->check_size; 326 $self->realloc;
298} 327}
299 328
300sub size_request { 329sub size_request {
301 require Carp; 330 require Carp;
302 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
304 333
305sub configure { 334sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
307 336
308 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
311 342
312 # use alignment to adjust x, y 343 # use alignment to adjust x, y
313 344
314 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 347 }
319 348
320 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 350 $self->{x} = $x;
322 $self->{y} = $y; 351 $self->{y} = $y;
323 $self->update; 352 $self->update;
324 } 353 }
325 354
326 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
328 } 359 }
329} 360}
330 361
331sub size_allocate { 362sub size_allocate {
332 # nothing to be done 363 # nothing to be done
333}
334
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340} 364}
341 365
342sub children { 366sub children {
343} 367}
344 368
… …
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
426sub 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}
427 521
428sub draw { 522sub draw {
429 my ($self) = @_; 523 my ($self) = @_;
430 524
431 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
448 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
449 glEnd; 543 glEnd;
450 glDisable GL_BLEND; 544 glDisable GL_BLEND;
451 } 545 }
452 546
453 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
454 glPushMatrix; 548 glPushMatrix;
455 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
469 my ($self) = @_; 563 my ($self) = @_;
470 564
471 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
472} 566}
473 567
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 568sub DESTROY {
535 my ($self) = @_; 569 my ($self) = @_;
536 570
537 delete $WIDGET{$self+0}; 571 delete $WIDGET{$self+0};
538 #$self->deactivate; 572 #$self->deactivate;
… …
594 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
596} 630}
597 631
598sub size_request { 632sub size_request {
599 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
600} 636}
601 637
602sub draw { } 638sub draw { }
603 639
604############################################################################# 640#############################################################################
… …
633 $self->{children} = [ 669 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
636 ]; 672 ];
637 673
638 $self->check_size (1); 674 $self->realloc;
639 $self->update;
640} 675}
641 676
642sub children { 677sub children {
643 @{ $_[0]{children} } 678 @{ $_[0]{children} }
644} 679}
… …
649 delete $child->{parent}; 684 delete $child->{parent};
650 $child->hide; 685 $child->hide;
651 686
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 688
654 $self->check_size (1); 689 $self->realloc;
655 $self->update;
656} 690}
657 691
658sub clear { 692sub clear {
659 my ($self) = @_; 693 my ($self) = @_;
660 694
… …
664 for (@$children) { 698 for (@$children) {
665 delete $_->{parent}; 699 delete $_->{parent};
666 $_->hide; 700 $_->hide;
667 } 701 }
668 702
669 $self->check_size; 703 $self->realloc;
670 $self->update;
671} 704}
672 705
673sub find_widget { 706sub find_widget {
674 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
675 708
… …
728sub size_request { 761sub size_request {
729 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
730} 763}
731 764
732sub size_allocate { 765sub size_allocate {
733 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
734 767
735 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
736} 769}
737 770
738############################################################################# 771#############################################################################
… …
755 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
756 $self->SUPER::update; 789 $self->SUPER::update;
757} 790}
758 791
759sub size_allocate { 792sub size_allocate {
760 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
761 794
762 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
763 $self->update; 796 $self->update
797 if $changed;
764} 798}
765 799
766sub _render { 800sub _render {
767 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
768} 802}
… …
812} 846}
813 847
814sub size_request { 848sub size_request {
815 my ($self) = @_; 849 my ($self) = @_;
816 850
817 @$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)};
818 852
819 @$self{qw(child_w child_h)} 853 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y};
855
856 ($w, $h)
820} 857}
821 858
822sub size_allocate { 859sub size_allocate {
823 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
824 861
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827 864
828 $self->child->configure (0, 0, $w, $h); 865 $self->child->configure (0, 0, $w, $h);
… …
915 my $child = $self->{vp}->child; 952 my $child = $self->{vp}->child;
916 $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]);
917} 954}
918 955
919sub size_allocate { 956sub size_allocate {
920 my ($self, $w, $h) = @_; 957 my ($self, $w, $h, $changed) = @_;
921 958
922 $self->SUPER::size_allocate ($w, $h); 959 $self->SUPER::size_allocate ($w, $h, $changed);
923 960
924 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
925 $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]);
926} 963}
927 964
… …
974 1011
975our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
976 1013
977use CFClient::OpenGL; 1014use CFClient::OpenGL;
978 1015
979my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 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);
982 1023
983sub new { 1024sub new {
984 my $class = shift; 1025 my $class = shift;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1026
988 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1030 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1031 can_events => 1,
994 @_ 1032 @_
995 ); 1033 );
996 1034
997 $self->{title} &&= new CFClient::UI::Label 1035 $self->{title} &&= new CFClient::UI::Label
… …
1017 $h + $self->border * 2, 1055 $h + $self->border * 2,
1018 ) 1056 )
1019} 1057}
1020 1058
1021sub size_allocate { 1059sub size_allocate {
1022 my ($self, $w, $h) = @_; 1060 my ($self, $w, $h, $changed) = @_;
1061
1062 return unless $changed;
1023 1063
1024 $h -= List::Util::max 0, $self->border * 2; 1064 $h -= List::Util::max 0, $self->border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1065 $w -= List::Util::max 0, $self->border * 2;
1026 1066
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1067 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1051 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
1052 1092
1053 my $dx = $ev->{x} - $ox; 1093 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1094 my $dy = $ev->{y} - $oy;
1055 1095
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1098
1061 $self->check_size; 1099 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1062 }; 1101 };
1063 1102
1064 } elsif ($lr ^ $td) { 1103 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1104 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1105 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1107 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1108 my ($ev, $x, $y) = @_;
1070 1109
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1110 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1111
1073 $self->{user_x} = $bx + $x - $ox; 1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy;
1075 $self->move ($self->{user_x}, $self->{user_y});
1076 $self->update;
1077 }; 1113 };
1078 } 1114 }
1079} 1115}
1080 1116
1081sub button_up { 1117sub button_up {
… …
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1137
1102 my $border = $self->border; 1138 my $border = $self->border;
1103 1139
1104 glColor @{ $self->{border_bg} }; 1140 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1141 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1142 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1143 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1144 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1145
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1146 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1147 glColor @{ $self->{bg} };
1112 1148
1113 # TODO: repeat texture not scale 1149 # TODO: repeat texture not scale
1150 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1151 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1152 $bg->{t} = $ch / $bg->{h};
1116
1117 glColor @{ $self->{bg} };
1118
1119 $bg->{s} = $rep_x;
1120 $bg->{t} = $rep_y;
1121 $bg->{wrap_mode} = 1;
1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1154 }
1124 1155
1125 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
1126 1157
… …
1156 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
1157 1188
1158 $child->set_parent ($self); 1189 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
1160 1191
1161 $self->check_size (1); 1192 $self->realloc;
1162} 1193}
1163 1194
1164# TODO: move to container class maybe? send children a signal on removal? 1195# TODO: move to container class maybe? send children a signal on removal?
1165sub clear { 1196sub clear {
1166 my ($self) = @_; 1197 my ($self) = @_;
… …
1171 for (@children) { 1202 for (@children) {
1172 delete $_->{parent}; 1203 delete $_->{parent};
1173 $_->hide; 1204 $_->hide;
1174 } 1205 }
1175 1206
1176 $self->check_size (1); 1207 $self->realloc;
1177 $self->update;
1178} 1208}
1179 1209
1180sub get_wh { 1210sub get_wh {
1181 my ($self) = @_; 1211 my ($self) = @_;
1182 1212
… …
1209 (sum @$hs), 1239 (sum @$hs),
1210 ) 1240 )
1211} 1241}
1212 1242
1213sub size_allocate { 1243sub size_allocate {
1214 my ($self, $w, $h) = @_; 1244 my ($self, $w, $h, $changed) = @_;
1215 1245
1216 my ($ws, $hs) = $self->get_wh; 1246 my ($ws, $hs) = $self->get_wh;
1217 1247
1218 my $req_w = (sum @$ws) || 1; 1248 my $req_w = (sum @$ws) || 1;
1219 my $req_h = (sum @$hs) || 1; 1249 my $req_h = (sum @$hs) || 1;
… …
1278 } 1308 }
1279} 1309}
1280 1310
1281############################################################################# 1311#############################################################################
1282 1312
1313package CFClient::UI::Box;
1314
1315our @ISA = CFClient::UI::Container::;
1316
1317sub size_request {
1318 my ($self) = @_;
1319
1320 $self->{vertical}
1321 ? (
1322 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1324 )
1325 : (
1326 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1327 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1328 )
1329}
1330
1331sub size_allocate {
1332 my ($self, $w, $h, $changed) = @_;
1333
1334 my $space = $self->{vertical} ? $h : $w;
1335 my $children = $self->{children};
1336
1337 my @req;
1338
1339 if ($self->{homogeneous}) {
1340 @req = ($space / (@$children || 1)) x @$children;
1341 } else {
1342 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1343 my $req = List::Util::sum @req;
1344
1345 if ($req > $space) {
1346 # ah well, not enough space
1347 $_ *= $space / $req for @req;
1348 } else {
1349 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1350
1351 $space = ($space - $req) / $expand; # remaining space to give away
1352
1353 $req[$_] += $space * $children->[$_]{expand}
1354 for 0 .. $#$children;
1355 }
1356 }
1357
1358 CFClient::UI::harmonize \@req;
1359
1360 my $pos = 0;
1361 for (0 .. $#$children) {
1362 my $alloc = $req[$_];
1363 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1364
1365 $pos += $alloc;
1366 }
1367
1368 1
1369}
1370
1371#############################################################################
1372
1283package CFClient::UI::HBox; 1373package CFClient::UI::HBox;
1284 1374
1285# TODO: wrap into common Box base class
1286
1287our @ISA = CFClient::UI::Container::; 1375our @ISA = CFClient::UI::Box::;
1288 1376
1289sub size_request { 1377sub new {
1290 my ($self) = @_; 1378 my $class = shift;
1291 1379
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1380 $class->SUPER::new (
1293 1381 vertical => 0,
1294 ( 1382 @_,
1295 (List::Util::sum map $_->[0], @alloc),
1296 (List::Util::max map $_->[1], @alloc),
1297 ) 1383 )
1298} 1384}
1299 1385
1300sub size_allocate {
1301 my ($self, $w, $h) = @_;
1302
1303 ($h, $w) = ($w, $h);
1304
1305 my $children = $self->{children};
1306
1307 my @h = map $_->{req_w}, @$children;
1308
1309 my $req_h = List::Util::sum @h;
1310
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } else {
1315 my $exp = List::Util::sum map $_->{expand}, @$children;
1316 $exp ||= 1;
1317
1318 for (0 .. $#$children) {
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 }
1325 }
1326
1327 CFClient::UI::harmonize \@h;
1328
1329 my $y = 0;
1330 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_];
1333 $child->configure ($y, 0, $h, $w);
1334
1335 $y += $h;
1336 }
1337
1338 1
1339}
1340
1341############################################################################# 1386#############################################################################
1342 1387
1343package CFClient::UI::VBox; 1388package CFClient::UI::VBox;
1344 1389
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Box::;
1348 1391
1349sub size_request { 1392sub new {
1350 my ($self) = @_; 1393 my $class = shift;
1351 1394
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $class->SUPER::new (
1353 1396 vertical => 1,
1354 ( 1397 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1398 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1399}
1398 1400
1399############################################################################# 1401#############################################################################
1400 1402
1401package CFClient::UI::Label; 1403package CFClient::UI::Label;
… …
1464 $self->{text} = "T$text"; 1466 $self->{text} = "T$text";
1465 1467
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1469 $self->{layout}->set_text ($text);
1468 1470
1471 $self->realloc;
1469 $self->update; 1472 $self->update;
1470 $self->check_size;
1471} 1473}
1472 1474
1473sub set_markup { 1475sub set_markup {
1474 my ($self, $markup) = @_; 1476 my ($self, $markup) = @_;
1475 1477
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1481 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1482
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1483 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482 $self->{layout}->set_markup ($markup); 1484 $self->{layout}->set_markup ($markup);
1483 1485
1486 $self->realloc;
1484 $self->update; 1487 $self->update;
1485 $self->check_size;
1486} 1488}
1487 1489
1488sub size_request { 1490sub size_request {
1489 my ($self) = @_; 1491 my ($self) = @_;
1490 1492
… …
1511 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1512 ) 1514 )
1513} 1515}
1514 1516
1515sub size_allocate { 1517sub size_allocate {
1516 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1517 1519
1518 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1519} 1522}
1520 1523
1521sub set_fontsize { 1524sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1523 1526
1524 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1528 delete $self->{texture};
1526 1529
1527 $self->update; 1530 $self->realloc;
1528 $self->check_size;
1529} 1531}
1530 1532
1531sub _draw { 1533sub _draw {
1532 my ($self) = @_; 1534 my ($self) = @_;
1533 1535
… …
1613sub set_text { 1615sub set_text {
1614 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1615 1617
1616 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1619 $self->_set_text ($text);
1618 $self->update; 1620
1619 $self->check_size; 1621 $self->realloc;
1620} 1622}
1621 1623
1622sub get_text { 1624sub get_text {
1623 $_[0]{text} 1625 $_[0]{text}
1624} 1626}
… …
1657 } elsif ($uni) { 1659 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1659 } 1661 }
1660 1662
1661 $self->_set_text ($text); 1663 $self->_set_text ($text);
1662 $self->update; 1664
1663 $self->check_size; 1665 $self->realloc;
1664} 1666}
1665 1667
1666sub focus_in { 1668sub focus_in {
1667 my ($self) = @_; 1669 my ($self) = @_;
1668 1670
… …
2161 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2164 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2165 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2166 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2167 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2168 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2169 min_h => $::WIDTH / 80,
2168 vertical => 0, 2170 vertical => 0,
2169 can_hover => 1, 2171 can_hover => 1,
2170 inner_pad => 0.02, 2172 inner_pad => 0.02,
2171 @_ 2173 @_
2172 ); 2174 );
… …
2175 $self->update; 2177 $self->update;
2176 2178
2177 $self 2179 $self
2178} 2180}
2179 2181
2182sub changed { }
2183
2180sub set_range { 2184sub set_range {
2181 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2182 2186
2183 ($range, $self->{range}) = ($self->{range}, $range); 2187 ($range, $self->{range}) = ($self->{range}, $range);
2184 2188
… …
2210} 2214}
2211 2215
2212sub size_request { 2216sub size_request {
2213 my ($self) = @_; 2217 my ($self) = @_;
2214 2218
2215 my $w = $self->{req_w}; 2219 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2220}
2220 2221
2221sub button_down { 2222sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2223 my ($self, $ev, $x, $y) = @_;
2223 2224
… …
2373 $self->{fontsize} = $fontsize; 2374 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2375 $self->reflow;
2375} 2376}
2376 2377
2377sub size_allocate { 2378sub size_allocate {
2378 my ($self, $w, $h) = @_; 2379 my ($self, $w, $h, $changed) = @_;
2379 2380
2380 $self->SUPER::size_allocate ($w, $h); 2381 $self->SUPER::size_allocate ($w, $h, $changed);
2382
2383 return unless $changed;
2381 2384
2382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2385 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2385 2388
… …
2579 state => 0, 2582 state => 0,
2580 on_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2581 @_ 2584 @_
2582 ); 2585 );
2583 2586
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2587 $self
2590} 2588}
2591 2589
2592sub toggle_flopper { 2590sub toggle_flopper {
2593 my ($self) = @_; 2591 my ($self) = @_;
2594 2592
2595 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2594}
2607 2595
2608############################################################################# 2596#############################################################################
2609 2597
2610package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2642 2630
2643 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2644} 2632}
2645 2633
2646sub size_allocate { 2634sub size_allocate {
2647 my ($self, $w, $h) = @_; 2635 my ($self, $w, $h, $changed) = @_;
2648 2636
2637 return unless $changed;
2638
2649 $self->SUPER::size_allocate ($w - 4, $h - 4); 2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2640}
2641
2642sub visibility_change {
2643 my ($self, $visible) = @_;
2644
2645 return unless $visible;
2646
2647 $self->{root}->on_post_alloc ("move_$self" => sub {
2648 my $widget = $self->{owner}
2649 or return;
2650
2651 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652
2653 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654 if $x + $self->{w} > $::WIDTH;
2655
2656 $self->move_abs ($x, $y);
2657 });
2650} 2658}
2651 2659
2652sub _draw { 2660sub _draw {
2653 my ($self) = @_; 2661 my ($self) = @_;
2654 2662
… …
2671 glVertex $w, $h; 2679 glVertex $w, $h;
2672 glVertex $w, 0; 2680 glVertex $w, 0;
2673 glEnd; 2681 glEnd;
2674 2682
2675 glTranslate 2 - 0.375, 2 - 0.375; 2683 glTranslate 2 - 0.375, 2 - 0.375;
2684
2676 $self->SUPER::_draw; 2685 $self->SUPER::_draw;
2677} 2686}
2678 2687
2679############################################################################# 2688#############################################################################
2680 2689
… …
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796 2805
2797 $row++; 2806 $row++;
2798 } 2807 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804} 2808}
2805 2809
2806############################################################################# 2810#############################################################################
2807 2811
2808package CFClient::UI::Menu; 2812package CFClient::UI::Menu;
… …
2994use CFClient::OpenGL; 2998use CFClient::OpenGL;
2995 2999
2996sub new { 3000sub new {
2997 my $class = shift; 3001 my $class = shift;
2998 3002
2999 $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
3000 visible => 1, 3004 visible => 1,
3001 @_, 3005 @_,
3002 ) 3006 );
3007
3008 Scalar::Util::weaken ($self->{root} = $self);
3009
3010 $self
3003} 3011}
3004 3012
3005sub configure { 3013sub configure {
3006 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
3007 3015
3008 $self->{w} = $w; 3016 $self->{w} = $w;
3009 $self->{h} = $h; 3017 $self->{h} = $h;
3010} 3018}
3011 3019
3012sub check_size { 3020sub reconfigure {
3013 my ($self) = @_; 3021 my ($self) = @_;
3014 3022
3023 $self->SUPER::reconfigure;
3024
3015 $self->size_allocate ($self->{w}, $self->{h}) 3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
3016 if $self->{w}; 3026 if $self->{w};
3017} 3027}
3018 3028
3019sub size_request { 3029sub size_request {
3020 my ($self) = @_; 3030 my ($self) = @_;
3021 3031
3022 ($self->{w}, $self->{h}) 3032 ($self->{w}, $self->{h})
3023} 3033}
3024 3034
3035sub _to_pixel {
3036 my ($coord, $size, $max) = @_;
3037
3038 $coord =
3039 $coord eq "center" ? ($max - $size) * 0.5
3040 : $coord eq "max" ? $max
3041 : $coord;
3042
3043 $coord = 0 if $coord < 0;
3044 $coord = $max - $size if $coord > $max - $size;
3045
3046 int $coord + 0.5
3047}
3048
3025sub size_allocate { 3049sub size_allocate {
3026 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h, $changed) = @_;
3027 3051
3028 for my $child ($self->children) { 3052 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 3054
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3055 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3056 $Y = $child->{force_y} if exists $child->{force_y};
3033 3057
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3058 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3059 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3060
3040 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
3041 } 3062 }
3042} 3063}
3043 3064
… …
3054} 3075}
3055 3076
3056sub update { 3077sub update {
3057 my ($self) = @_; 3078 my ($self) = @_;
3058 3079
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
3061} 3081}
3062 3082
3063sub add { 3083sub add {
3064 my ($self, @children) = @_; 3084 my ($self, @children) = @_;
3065 3085
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3086 $_->{is_toplevel} = 1
3074 3087 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3088
3080 $self->SUPER::add (@children); 3089 $self->SUPER::add (@children);
3081} 3090}
3082 3091
3083sub remove { 3092sub remove {
3084 my ($self, @children) = @_; 3093 my ($self, @children) = @_;
3085 3094
3086 $self->SUPER::remove (@children); 3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3087 3099
3088 while (@children) { 3100 while (@children) {
3089 my $w = pop @children; 3101 my $w = pop @children;
3090 push @children, $w->children; 3102 push @children, $w->children;
3091 $w->set_invisible; 3103 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
3111 $_->() 3123 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
3113 } 3125 }
3114 3126
3115 if ($self->{check_size}) { 3127 if ($self->{realloc}) {
3116 my @queue; 3128 my @queue;
3117 3129
3118 for (;;) { 3130 while () {
3119 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3120 #TODO use array-of-depth approach 3132 #TODO use array-of-depth approach
3121 3133
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3134 @queue = sort { $a->{visible} <=> $b->{visible} }
3123 @queue, values %{delete $self->{check_size}}; 3135 @queue, values %{delete $self->{realloc}};
3124 } 3136 }
3125 3137
3126 my $widget = pop @queue || last; 3138 my $widget = pop @queue || last;
3127 3139
3128 defined $widget->{visible} or last; # do not resize invisible widgets 3140 $widget->{visible} or last; # do not resize invisible widgets
3129 3141
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request; 3142 my ($w, $h) = $widget->size_request;
3133 3143
3134 if (delete $widget->{force_alloc} 3144 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3145
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;
3137 3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;
3148
3149 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h};
3151
3138 $widget->{req_w} = $w; 3152 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3153 $widget->{req_h} = $h;
3140 3154
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3155 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3142 3156
3143 $widget->{parent}->check_size 3157 push @queue, $widget->{parent}
3144 if $widget->{parent}; 3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3145 }
3146 } 3159 }
3147 } 3160 }
3148 3161
3149 while ($self->{size_alloc}) { 3162 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 my ($widget, $w, $h) = @$_; 3164 values %$size_alloc;
3165
3166 while () {
3167 my ($widget, $w, $h) = @{ pop @queue or last };
3168
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3152 3171
3153 $w = 0 if $w < 0; 3172 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3173 $h = 0 if $h < 0;
3155 3174
3175 $w = int $w + 0.5;
3176 $h = int $h + 0.5;
3177
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3179
3156 $widget->{w} = $w; 3180 $widget->{w} = $w;
3157 $widget->{h} = $h; 3181 $widget->{h} = $h;
3182
3158 $widget->emit (size_allocate => $w, $h); 3183 $widget->emit (size_allocate => $w, $h, $changed);
3159 } 3184 }
3160 } 3185 }
3161 3186
3162 while ($self->{post_alloc_hook}) { 3187 while ($self->{post_alloc_hook}) {
3163 $_->() 3188 $_->()

Diff Legend

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