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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31 }
32
33 $layout
34}
35
36sub set_layout {
37 my ($layout) = @_;
38 $LAYOUT = $layout;
39}
18 40
19sub check_tooltip { 41sub check_tooltip {
20 if (!$GRAB) { 42 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
23 45
24 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
25 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
26 50
27 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
28 52
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 54
31 $TOOLTIP->set_tooltip_from ($widget); 55 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 56 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 57 }
43 58
44 return; 59 return;
45 } 60 }
46 } 61 }
… …
152sub rescale_widgets { 167sub rescale_widgets {
153 my ($sx, $sy) = @_; 168 my ($sx, $sy) = @_;
154 169
155 for my $widget (values %WIDGET) { 170 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 171 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 181
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184
165 } 185 }
166 } 186 }
167 187
168 reconfigure_widgets; 188 reconfigure_widgets;
169} 189}
… …
178 198
179sub new { 199sub new {
180 my $class = shift; 200 my $class = shift;
181 201
182 my $self = bless { 202 my $self = bless {
183 x => 0, 203 x => "center",
184 y => 0, 204 y => "center",
185 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
186 can_events => 1, 208 can_events => 1,
187 @_ 209 @_
188 }, $class; 210 }, $class;
189 211
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223
190 for (keys %$self) { 224 for (keys %$self) {
191 if (/^connect_(.*)$/) { 225 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
193 } 227 }
194 } 228 }
195 229
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
198 $self 230 $self
199} 231}
200 232
201sub destroy { 233sub destroy {
202 my ($self) = @_; 234 my ($self) = @_;
… …
205 %$self = (); 237 %$self = ();
206} 238}
207 239
208sub show { 240sub show {
209 my ($self) = @_; 241 my ($self) = @_;
242
210 return if $self->{parent}; 243 return if $self->{parent};
211 244
212 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
213} 246}
214 247
215sub show_centered { 248sub set_visible {
216 my ($self) = @_; 249 my ($self) = @_;
250
217 return if $self->{parent}; 251 return if $self->{visible};
218 252
219 $self->show; 253 $self->{root} = $self->{parent}{root};
254 $self->{visible} = $self->{parent}{visible} + 1;
220 255
221 $CFClient::UI::ROOT->on_post_alloc ( 256 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 257
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 258 $self->realloc if !exists $self->{req_w};
224 }, 259
225 ); 260 $_->set_visible for $self->children;
226} 261}
227 262
228sub set_invisible { 263sub set_invisible {
229 my ($self) = @_; 264 my ($self) = @_;
230 265
231 # broken show/hide model 266 return unless $self->{visible};
232 267
268 $_->set_invisible for $self->children;
269
270 delete $self->{root};
233 delete $self->{visible}; 271 delete $self->{visible};
234 272
235 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
237 275
238 CFClient::UI::check_tooltip 276 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 277 if $TOOLTIP->{owner} == $self;
240 278
241 $self->focus_out; 279 $self->focus_out;
280
281 $self->emit (visibility_change => 0);
282}
283
284sub set_visibility {
285 my ($self, $visible) = @_;
286
287 return if $self->{visible} == $visible;
288
289 $visible ? $self->hide
290 : $self->show;
291}
292
293sub toggle_visibility {
294 my ($self) = @_;
295
296 $self->{visible}
297 ? $self->hide
298 : $self->show;
242} 299}
243 300
244sub hide { 301sub hide {
245 my ($self) = @_; 302 my ($self) = @_;
246 303
… …
248 305
249 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
250 if $self->{parent}; 307 if $self->{parent};
251} 308}
252 309
253sub move { 310sub move_abs {
254 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
255 312
256 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
259 316
260 $self->update; 317 $self->update;
261} 318}
262 319
263sub set_size { 320sub set_size {
264 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
265 322
266 $self->{user_w} = $w; 323 $self->{force_w} = $w;
267 $self->{user_h} = $h; 324 $self->{force_h} = $h;
268 325
269 $self->check_size; 326 $self->realloc;
270} 327}
271 328
272sub size_request { 329sub size_request {
273 require Carp; 330 require Carp;
274 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
276 333
277sub configure { 334sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
279 336
280 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
283 342
284 # use alignment to adjust x, y 343 # use alignment to adjust x, y
285 344
286 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 347 }
291 348
292 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 350 $self->{x} = $x;
294 $self->{y} = $y; 351 $self->{y} = $y;
295 $self->update; 352 $self->update;
296 } 353 }
297 354
298 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 359 }
301} 360}
302 361
303sub size_allocate { 362sub size_allocate {
304 # nothing to be done 363 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 364}
313 365
314sub children { 366sub children {
315} 367}
316 368
… …
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451
452sub find_widget {
453 my ($self, $x, $y) = @_;
454
455 return () unless $self->{can_events};
456
457 return $self
458 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
459 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
460
461 ()
462}
463
464sub set_parent {
465 my ($self, $parent) = @_;
466
467 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible};
470}
471
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc {
496 my ($self) = @_;
497
498 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self};
500
501 $self->{root}{realloc}{$self} = $self;
502 $self->{root}->update;
503 } else {
504 delete $self->{req_w};
505 }
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub reconfigure {
516 my ($self) = @_;
517
518 $self->realloc;
519 $self->update;
520}
399 521
400sub draw { 522sub draw {
401 my ($self) = @_; 523 my ($self) = @_;
402 524
403 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
420 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
421 glEnd; 543 glEnd;
422 glDisable GL_BLEND; 544 glDisable GL_BLEND;
423 } 545 }
424 546
425 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
426 glPushMatrix; 548 glPushMatrix;
427 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
441 my ($self) = @_; 563 my ($self) = @_;
442 564
443 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
444} 566}
445 567
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504}
505
506sub DESTROY { 568sub DESTROY {
507 my ($self) = @_; 569 my ($self) = @_;
508 570
509 delete $WIDGET{$self+0}; 571 delete $WIDGET{$self+0};
510 #$self->deactivate; 572 #$self->deactivate;
… …
566 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
568} 630}
569 631
570sub size_request { 632sub size_request {
571 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
572} 636}
573 637
574sub draw { } 638sub draw { }
575 639
576############################################################################# 640#############################################################################
… …
605 $self->{children} = [ 669 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
608 ]; 672 ];
609 673
610 $self->check_size (1); 674 $self->realloc;
611 $self->update;
612} 675}
613 676
614sub children { 677sub children {
615 @{ $_[0]{children} } 678 @{ $_[0]{children} }
616} 679}
… …
621 delete $child->{parent}; 684 delete $child->{parent};
622 $child->hide; 685 $child->hide;
623 686
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 688
626 $self->check_size (1); 689 $self->realloc;
627 $self->update;
628} 690}
629 691
630sub clear { 692sub clear {
631 my ($self) = @_; 693 my ($self) = @_;
632 694
… …
636 for (@$children) { 698 for (@$children) {
637 delete $_->{parent}; 699 delete $_->{parent};
638 $_->hide; 700 $_->hide;
639 } 701 }
640 702
641 $self->check_size; 703 $self->realloc;
642 $self->update;
643} 704}
644 705
645sub find_widget { 706sub find_widget {
646 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
647 708
… …
700sub size_request { 761sub size_request {
701 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
702} 763}
703 764
704sub size_allocate { 765sub size_allocate {
705 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
706 767
707 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
708} 769}
709 770
710############################################################################# 771#############################################################################
… …
727 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
728 $self->SUPER::update; 789 $self->SUPER::update;
729} 790}
730 791
731sub size_allocate { 792sub size_allocate {
732 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
733 794
734 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
735 $self->update; 796 $self->update
797 if $changed;
736} 798}
737 799
738sub _render { 800sub _render {
739 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
740} 802}
… …
784} 846}
785 847
786sub size_request { 848sub size_request {
787 my ($self) = @_; 849 my ($self) = @_;
788 850
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
790 852
791 @$self{qw(child_w child_h)} 853 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y};
855
856 ($w, $h)
792} 857}
793 858
794sub size_allocate { 859sub size_allocate {
795 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
796 861
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799 864
800 $self->child->configure (0, 0, $w, $h); 865 $self->child->configure (0, 0, $w, $h);
… …
856 my $class = shift; 921 my $class = shift;
857 922
858 my $self; 923 my $self;
859 924
860 my $slider = new CFClient::UI::Slider 925 my $slider = new CFClient::UI::Slider
861 vertical => 1, 926 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 927 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 928 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 929 $self->{vp}->set_offset (0, $_[1]);
865 }, 930 },
866 ; 931 ;
867 932
868 $self = $class->SUPER::new ( 933 $self = $class->SUPER::new (
… …
876 $self->add ($self->{slider}); 941 $self->add ($self->{slider});
877 942
878 $self 943 $self
879} 944}
880 945
946sub update {
947 my ($self) = @_;
948
949 $self->SUPER::update;
950
951 # todo: overwrite size_allocate of child
952 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954}
955
881sub size_allocate { 956sub size_allocate {
882 my ($self, $w, $h) = @_; 957 my ($self, $w, $h, $changed) = @_;
883 958
884 $self->SUPER::size_allocate ($w, $h); 959 $self->SUPER::size_allocate ($w, $h, $changed);
885 960
886 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
887 $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]);
888} 963}
889 964
… …
936 1011
937our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
938 1013
939use CFClient::OpenGL; 1014use CFClient::OpenGL;
940 1015
941my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 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);
944 1023
945sub new { 1024sub new {
946 my $class = shift; 1025 my $class = shift;
947
948 # TODO: user_x, user_y, overwrite moveto?
949 1026
950 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1030 border => 0.6,
954 is_toplevel => 1,
955 can_events => 1, 1031 can_events => 1,
956 @_ 1032 @_
957 ); 1033 );
958 1034
959 $self->{title} &&= new CFClient::UI::Label 1035 $self->{title} &&= new CFClient::UI::Label
… …
979 $h + $self->border * 2, 1055 $h + $self->border * 2,
980 ) 1056 )
981} 1057}
982 1058
983sub size_allocate { 1059sub size_allocate {
984 my ($self, $w, $h) = @_; 1060 my ($self, $w, $h, $changed) = @_;
1061
1062 return unless $changed;
985 1063
986 $h -= List::Util::max 0, $self->border * 2; 1064 $h -= List::Util::max 0, $self->border * 2;
987 $w -= List::Util::max 0, $self->border * 2; 1065 $w -= List::Util::max 0, $self->border * 2;
988 1066
989 $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)
… …
1013 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
1014 1092
1015 my $dx = $ev->{x} - $ox; 1093 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1094 my $dy = $ev->{y} - $oy;
1017 1095
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098
1099 $self->realloc;
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021 $self->check_size;
1022 }; 1101 };
1023 1102
1024 } elsif ($lr ^ $td) { 1103 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1104 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1105 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1028 $self->{motion} = sub { 1107 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1108 my ($ev, $x, $y) = @_;
1030 1109
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1110 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1111
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034 $self->update;
1035 }; 1113 };
1036 } 1114 }
1037} 1115}
1038 1116
1039sub button_up { 1117sub button_up {
… …
1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059 1137
1060 my $border = $self->border; 1138 my $border = $self->border;
1061 1139
1062 glColor @{ $self->{border_bg} }; 1140 glColor @{ $self->{border_bg} };
1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1141 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1142 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1143 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1144 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067 1145
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1146 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069 my $bg = $tex[0]; 1147 glColor @{ $self->{bg} };
1070 1148
1071 # TODO: repeat texture not scale 1149 # TODO: repeat texture not scale
1150 # solve this better(?)
1072 my $rep_x = $cw / $bg->{w}; 1151 $bg->{s} = $cw / $bg->{w};
1073 my $rep_y = $ch / $bg->{h}; 1152 $bg->{t} = $ch / $bg->{h};
1074
1075 glColor @{ $self->{bg} };
1076
1077 $bg->{s} = $rep_x;
1078 $bg->{t} = $rep_y;
1079 $bg->{wrap_mode} = 1;
1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 } 1154 }
1082 1155
1083 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
1084 1157
… …
1114 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
1115 1188
1116 $child->set_parent ($self); 1189 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
1118 1191
1119 $self->check_size (1); 1192 $self->realloc;
1120} 1193}
1121 1194
1122# 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?
1123sub clear { 1196sub clear {
1124 my ($self) = @_; 1197 my ($self) = @_;
… …
1129 for (@children) { 1202 for (@children) {
1130 delete $_->{parent}; 1203 delete $_->{parent};
1131 $_->hide; 1204 $_->hide;
1132 } 1205 }
1133 1206
1134 $self->check_size (1); 1207 $self->realloc;
1135 $self->update;
1136} 1208}
1137 1209
1138sub get_wh { 1210sub get_wh {
1139 my ($self) = @_; 1211 my ($self) = @_;
1140 1212
… …
1167 (sum @$hs), 1239 (sum @$hs),
1168 ) 1240 )
1169} 1241}
1170 1242
1171sub size_allocate { 1243sub size_allocate {
1172 my ($self, $w, $h) = @_; 1244 my ($self, $w, $h, $changed) = @_;
1173 1245
1174 my ($ws, $hs) = $self->get_wh; 1246 my ($ws, $hs) = $self->get_wh;
1175 1247
1176 my $req_w = (sum @$ws) || 1; 1248 my $req_w = (sum @$ws) || 1;
1177 my $req_h = (sum @$hs) || 1; 1249 my $req_h = (sum @$hs) || 1;
… …
1236 } 1308 }
1237} 1309}
1238 1310
1239############################################################################# 1311#############################################################################
1240 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
1241package CFClient::UI::HBox; 1373package CFClient::UI::HBox;
1242 1374
1243# TODO: wrap into common Box base class
1244
1245our @ISA = CFClient::UI::Container::; 1375our @ISA = CFClient::UI::Box::;
1246 1376
1247sub size_request { 1377sub new {
1248 my ($self) = @_; 1378 my $class = shift;
1249 1379
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1380 $class->SUPER::new (
1251 1381 vertical => 0,
1252 ( 1382 @_,
1253 (List::Util::sum map $_->[0], @alloc),
1254 (List::Util::max map $_->[1], @alloc),
1255 ) 1383 )
1256} 1384}
1257 1385
1258sub size_allocate {
1259 my ($self, $w, $h) = @_;
1260
1261 ($h, $w) = ($w, $h);
1262
1263 my $children = $self->{children};
1264
1265 my @h = map $_->{req_w}, @$children;
1266
1267 my $req_h = List::Util::sum @h;
1268
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children;
1274 $exp ||= 1;
1275
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 }
1283 }
1284
1285 CFClient::UI::harmonize \@h;
1286
1287 my $y = 0;
1288 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_];
1291 $child->configure ($y, 0, $h, $w);
1292
1293 $y += $h;
1294 }
1295
1296 1
1297}
1298
1299############################################################################# 1386#############################################################################
1300 1387
1301package CFClient::UI::VBox; 1388package CFClient::UI::VBox;
1302 1389
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Box::;
1306 1391
1307sub size_request { 1392sub new {
1308 my ($self) = @_; 1393 my $class = shift;
1309 1394
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $class->SUPER::new (
1311 1396 vertical => 1,
1312 ( 1397 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1398 )
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355} 1399}
1356 1400
1357############################################################################# 1401#############################################################################
1358 1402
1359package CFClient::UI::Label; 1403package CFClient::UI::Label;
… …
1422 $self->{text} = "T$text"; 1466 $self->{text} = "T$text";
1423 1467
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1469 $self->{layout}->set_text ($text);
1426 1470
1471 $self->realloc;
1427 $self->update; 1472 $self->update;
1428 $self->check_size;
1429} 1473}
1430 1474
1431sub set_markup { 1475sub set_markup {
1432 my ($self, $markup) = @_; 1476 my ($self, $markup) = @_;
1433 1477
… …
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1481 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1482
1439 $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;
1440 $self->{layout}->set_markup ($markup); 1484 $self->{layout}->set_markup ($markup);
1441 1485
1486 $self->realloc;
1442 $self->update; 1487 $self->update;
1443 $self->check_size;
1444} 1488}
1445 1489
1446sub size_request { 1490sub size_request {
1447 my ($self) = @_; 1491 my ($self) = @_;
1448 1492
… …
1469 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1470 ) 1514 )
1471} 1515}
1472 1516
1473sub size_allocate { 1517sub size_allocate {
1474 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1475 1519
1476 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1477} 1522}
1478 1523
1479sub set_fontsize { 1524sub set_fontsize {
1480 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1481 1526
1482 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1483 delete $self->{texture}; 1528 delete $self->{texture};
1484 1529
1485 $self->update; 1530 $self->realloc;
1486 $self->check_size;
1487} 1531}
1488 1532
1489sub _draw { 1533sub _draw {
1490 my ($self) = @_; 1534 my ($self) = @_;
1491 1535
… …
1571sub set_text { 1615sub set_text {
1572 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1573 1617
1574 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 1619 $self->_set_text ($text);
1576 $self->update; 1620
1577 $self->check_size; 1621 $self->realloc;
1578} 1622}
1579 1623
1580sub get_text { 1624sub get_text {
1581 $_[0]{text} 1625 $_[0]{text}
1582} 1626}
… …
1615 } elsif ($uni) { 1659 } elsif ($uni) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1617 } 1661 }
1618 1662
1619 $self->_set_text ($text); 1663 $self->_set_text ($text);
1620 $self->update; 1664
1621 $self->check_size; 1665 $self->realloc;
1622} 1666}
1623 1667
1624sub focus_in { 1668sub focus_in {
1625 my ($self) = @_; 1669 my ($self) = @_;
1626 1670
… …
2119 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
2120 active_fg => [0, 0, 0], 2164 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2], 2165 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5], 2166 active_bg => [1, 1, 1, 0.5],
2123 range => [0, 0, 100, 10, 0], 2167 range => [0, 0, 100, 10, 0],
2124 req_w => $::WIDTH / 80, 2168 min_w => $::WIDTH / 80,
2125 req_h => $::WIDTH / 80, 2169 min_h => $::WIDTH / 80,
2126 vertical => 0, 2170 vertical => 0,
2127 can_hover => 1, 2171 can_hover => 1,
2128 inner_pad => 0.02, 2172 inner_pad => 0.02,
2129 @_ 2173 @_
2130 ); 2174 );
… …
2133 $self->update; 2177 $self->update;
2134 2178
2135 $self 2179 $self
2136} 2180}
2137 2181
2182sub changed { }
2183
2138sub set_range { 2184sub set_range {
2139 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2140 2186
2141 $self->{range} = $range; 2187 ($range, $self->{range}) = ($self->{range}, $range);
2142 2188
2143 $self->update; 2189 $self->update
2190 if "@$range" ne "@{$self->{range}}";
2144} 2191}
2145 2192
2146sub set_value { 2193sub set_value {
2147 my ($self, $value) = @_; 2194 my ($self, $value) = @_;
2148 2195
… …
2167} 2214}
2168 2215
2169sub size_request { 2216sub size_request {
2170 my ($self) = @_; 2217 my ($self) = @_;
2171 2218
2172 my $w = $self->{req_w}; 2219 ($self->{req_w}, $self->{req_h})
2173 my $h = $self->{req_h};
2174
2175 $self->{vertical} ? ($h, $w) : ($w, $h)
2176} 2220}
2177 2221
2178sub button_down { 2222sub button_down {
2179 my ($self, $ev, $x, $y) = @_; 2223 my ($self, $ev, $x, $y) = @_;
2180 2224
… …
2330 $self->{fontsize} = $fontsize; 2374 $self->{fontsize} = $fontsize;
2331 $self->reflow; 2375 $self->reflow;
2332} 2376}
2333 2377
2334sub size_allocate { 2378sub size_allocate {
2335 my ($self, $w, $h) = @_; 2379 my ($self, $w, $h, $changed) = @_;
2336 2380
2337 $self->SUPER::size_allocate ($w, $h); 2381 $self->SUPER::size_allocate ($w, $h, $changed);
2382
2383 return unless $changed;
2338 2384
2339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2385 $self->{layout}->set_font ($self->{font}) if $self->{font};
2340 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2341 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2342 2388
… …
2531 2577
2532sub new { 2578sub new {
2533 my $class = shift; 2579 my $class = shift;
2534 2580
2535 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2536 state => 0, 2582 state => 0,
2537 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2538 @_ 2584 @_
2539 ); 2585 );
2540 2586
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2587 $self
2547} 2588}
2548 2589
2549sub toggle_flopper { 2590sub toggle_flopper {
2550 my ($self) = @_; 2591 my ($self) = @_;
2551 2592
2552 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 2594}
2564 2595
2565############################################################################# 2596#############################################################################
2566 2597
2567package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2599 2630
2600 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2601} 2632}
2602 2633
2603sub size_allocate { 2634sub size_allocate {
2604 my ($self, $w, $h) = @_; 2635 my ($self, $w, $h, $changed) = @_;
2605 2636
2637 return unless $changed;
2638
2606 $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 });
2607} 2658}
2608 2659
2609sub _draw { 2660sub _draw {
2610 my ($self) = @_; 2661 my ($self) = @_;
2611 2662
… …
2628 glVertex $w, $h; 2679 glVertex $w, $h;
2629 glVertex $w, 0; 2680 glVertex $w, 0;
2630 glEnd; 2681 glEnd;
2631 2682
2632 glTranslate 2 - 0.375, 2 - 0.375; 2683 glTranslate 2 - 0.375, 2 - 0.375;
2684
2633 $self->SUPER::_draw; 2685 $self->SUPER::_draw;
2634} 2686}
2635 2687
2636############################################################################# 2688#############################################################################
2637 2689
… …
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753 2805
2754 $row++; 2806 $row++;
2755 } 2807 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763} 2808}
2764 2809
2765############################################################################# 2810#############################################################################
2766 2811
2767package CFClient::UI::Menu; 2812package CFClient::UI::Menu;
… …
2953use CFClient::OpenGL; 2998use CFClient::OpenGL;
2954 2999
2955sub new { 3000sub new {
2956 my $class = shift; 3001 my $class = shift;
2957 3002
2958 $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
3004 visible => 1,
2959 @_, 3005 @_,
2960 ) 3006 );
3007
3008 Scalar::Util::weaken ($self->{root} = $self);
3009
3010 $self
2961} 3011}
2962 3012
2963sub configure { 3013sub configure {
2964 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
2965 3015
2966 $self->{w} = $w; 3016 $self->{w} = $w;
2967 $self->{h} = $h; 3017 $self->{h} = $h;
2968} 3018}
2969 3019
2970sub check_size { 3020sub reconfigure {
2971 my ($self) = @_; 3021 my ($self) = @_;
2972 3022
3023 $self->SUPER::reconfigure;
3024
2973 $self->size_allocate ($self->{w}, $self->{h}) 3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
2974 if $self->{w}; 3026 if $self->{w};
2975} 3027}
2976 3028
2977sub size_request { 3029sub size_request {
2978 my ($self) = @_; 3030 my ($self) = @_;
2979 3031
2980 ($self->{w}, $self->{h}) 3032 ($self->{w}, $self->{h})
2981} 3033}
2982 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
2983sub size_allocate { 3049sub size_allocate {
2984 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h, $changed) = @_;
2985 3051
2986 for my $child ($self->children) { 3052 for my $child ($self->children) {
2987 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)};
2988 3054
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3055 $X = $child->{force_x} if exists $child->{force_x};
2990 if exists $child->{req_x}; 3056 $Y = $child->{force_y} if exists $child->{force_y};
2991 3057
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3058 $X = _to_pixel $X, $W, $self->{w};
2993 if exists $child->{req_y}; 3059 $Y = _to_pixel $Y, $H, $self->{h};
2994
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 3060
2998 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
2999 } 3062 }
3000} 3063}
3001 3064
… …
3012} 3075}
3013 3076
3014sub update { 3077sub update {
3015 my ($self) = @_; 3078 my ($self) = @_;
3016 3079
3017 $self->check_size;
3018 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
3019} 3081}
3020 3082
3021sub add { 3083sub add {
3022 my ($self, @children) = @_; 3084 my ($self, @children) = @_;
3023 3085
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3086 $_->{is_toplevel} = 1
3032 3087 for @children;
3033 # integerise window positions
3034 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y};
3036 }
3037 3088
3038 $self->SUPER::add (@children); 3089 $self->SUPER::add (@children);
3039} 3090}
3040 3091
3041sub remove { 3092sub remove {
3042 my ($self, @children) = @_; 3093 my ($self, @children) = @_;
3043 3094
3044 $self->SUPER::remove (@children); 3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3045 3099
3046 while (@children) { 3100 while (@children) {
3047 my $w = pop @children; 3101 my $w = pop @children;
3048 push @children, $w->children; 3102 push @children, $w->children;
3049 $w->set_invisible; 3103 $w->set_invisible;
… …
3068 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
3069 $_->() 3123 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
3071 } 3125 }
3072 3126
3073 if ($self->{check_size}) { 3127 if ($self->{realloc}) {
3074 my @queue = ([], []); 3128 my @queue;
3075 3129
3076 for (;;) { 3130 while () {
3077 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3078 # heuristic: check containers last 3132 #TODO use array-of-depth approach
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3133
3080 for values %{delete $self->{check_size}} 3134 @queue = sort { $a->{visible} <=> $b->{visible} }
3135 @queue, values %{delete $self->{realloc}};
3081 } 3136 }
3082 3137
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3138 my $widget = pop @queue || last;
3084 3139
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3140 $widget->{visible} or last; # do not resize invisible widgets
3086 ? @$widget{qw(user_w user_h)} 3141
3087 : $widget->size_request; 3142 my ($w, $h) = $widget->size_request;
3088 3143
3089 if (delete $widget->{force_alloc} 3144 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3145
3091 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;
3092 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
3093 $widget->{req_w} = $w; 3152 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 3153 $widget->{req_h} = $h;
3095 3154
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3155 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3097 3156
3098 $widget->{parent}->check_size 3157 push @queue, $widget->{parent}
3099 if $widget->{parent}; 3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3100 }
3101 } 3159 }
3102 } 3160 }
3103 3161
3104 while ($self->{size_alloc}) { 3162 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3106 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;
3107 3171
3108 $w = 0 if $w < 0; 3172 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 3173 $h = 0 if $h < 0;
3110 3174
3175 $w = int $w + 0.5;
3176 $h = int $h + 0.5;
3177
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3179
3111 $widget->{w} = $w; 3180 $widget->{w} = $w;
3112 $widget->{h} = $h; 3181 $widget->{h} = $h;
3182
3113 $widget->emit (size_allocate => $w, $h); 3183 $widget->emit (size_allocate => $w, $h, $changed);
3114 } 3184 }
3115 } 3185 }
3116 3186
3117 while ($self->{post_alloc_hook}) { 3187 while ($self->{post_alloc_hook}) {
3118 $_->() 3188 $_->()

Diff Legend

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