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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC

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

Diff Legend

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