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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
29 } 31 }
30 32
31 return $LAYOUT; 33 $layout
32} 34}
33 35
34sub set_layout { 36sub set_layout {
35 my ($layout) = @_; 37 my ($layout) = @_;
36 $LAYOUT = $layout; 38 $LAYOUT = $layout;
… …
40 if (!$GRAB) { 42 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
43 45
44 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
45 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
46 50
47 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
48 52
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 54
51 $TOOLTIP->set_tooltip_from ($widget); 55 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 56 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 57 }
63 58
64 return; 59 return;
65 } 60 }
66 } 61 }
… …
172sub rescale_widgets { 167sub rescale_widgets {
173 my ($sx, $sy) = @_; 168 my ($sx, $sy) = @_;
174 169
175 for my $widget (values %WIDGET) { 170 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 171 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 181
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184
185 } 185 }
186 } 186 }
187 187
188 reconfigure_widgets; 188 reconfigure_widgets;
189} 189}
… …
198 198
199sub new { 199sub new {
200 my $class = shift; 200 my $class = shift;
201 201
202 my $self = bless { 202 my $self = bless {
203 x => 0, 203 x => "center",
204 y => 0, 204 y => "center",
205 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
206 can_events => 1, 208 can_events => 1,
207 @_ 209 @_
208 }, $class; 210 }, $class;
211
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 223
210 for (keys %$self) { 224 for (keys %$self) {
211 if (/^on_(.*)$/) { 225 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
213 } 227 }
214 } 228 }
215 229
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
225 $self 230 $self
226} 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 return unless $self->{visible}; 266 return unless $self->{visible};
259 267
260 # broken show/hide model 268 $_->set_invisible for $self->children;
261 269
262 delete $self->{root}; 270 delete $self->{root};
263 delete $self->{visible}; 271 delete $self->{visible};
264 272
265 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
267 275
268 CFClient::UI::check_tooltip 276 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 277 if $TOOLTIP->{owner} == $self;
270 278
271 $self->focus_out; 279 $self->focus_out;
272 280
273 $self->emit (visibility_change => 0); 281 $self->emit (visibility_change => 0);
282}
283
284sub set_visibility {
285 my ($self, $visible) = @_;
286
287 return if $self->{visible} == $visible;
288
289 $visible ? $self->hide
290 : $self->show;
291}
292
293sub toggle_visibility {
294 my ($self) = @_;
295
296 $self->{visible}
297 ? $self->hide
298 : $self->show;
274} 299}
275 300
276sub hide { 301sub hide {
277 my ($self) = @_; 302 my ($self) = @_;
278 303
… …
280 305
281 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
282 if $self->{parent}; 307 if $self->{parent};
283} 308}
284 309
285sub move { 310sub move_abs {
286 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
287 312
288 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
289 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
290 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
291 316
292 $self->update; 317 $self->update;
293} 318}
294 319
295sub set_size { 320sub set_size {
296 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
297 322
298 $self->{user_w} = $w; 323 $self->{force_w} = $w;
299 $self->{user_h} = $h; 324 $self->{force_h} = $h;
300 325
301 $self->check_size; 326 $self->realloc;
302} 327}
303 328
304sub size_request { 329sub size_request {
305 require Carp; 330 require Carp;
306 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
308 333
309sub configure { 334sub configure {
310 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
311 336
312 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
313 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
314 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
315 342
316 # use alignment to adjust x, y 343 # use alignment to adjust x, y
317 344
318 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
319 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
320
321 ($w, $h) = ($w2, $h2);
322 } 347 }
323 348
324 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
325 $self->{x} = $x; 350 $self->{x} = $x;
326 $self->{y} = $y; 351 $self->{y} = $y;
327 $self->update; 352 $self->update;
328 } 353 }
329 354
330 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
331 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
332 } 359 }
333} 360}
334 361
335sub size_allocate { 362sub size_allocate {
336 # nothing to be done 363 # nothing to be done
337}
338
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344} 364}
345 365
346sub children { 366sub children {
347} 367}
348 368
… …
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
430sub 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}
431 521
432sub draw { 522sub draw {
433 my ($self) = @_; 523 my ($self) = @_;
434 524
435 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
452 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
453 glEnd; 543 glEnd;
454 glDisable GL_BLEND; 544 glDisable GL_BLEND;
455 } 545 }
456 546
457 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
458 glPushMatrix; 548 glPushMatrix;
459 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
461 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
473 my ($self) = @_; 563 my ($self) = @_;
474 564
475 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
476} 566}
477 567
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545}
546
547sub DESTROY { 568sub DESTROY {
548 my ($self) = @_; 569 my ($self) = @_;
549 570
550 delete $WIDGET{$self+0}; 571 delete $WIDGET{$self+0};
551 #$self->deactivate; 572 #$self->deactivate;
… …
607 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
608 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
609} 630}
610 631
611sub size_request { 632sub size_request {
612 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
613} 636}
614 637
615sub draw { } 638sub draw { }
616 639
617############################################################################# 640#############################################################################
… …
646 $self->{children} = [ 669 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
649 ]; 672 ];
650 673
651 $self->check_size (1); 674 $self->realloc;
652 $self->update;
653} 675}
654 676
655sub children { 677sub children {
656 @{ $_[0]{children} } 678 @{ $_[0]{children} }
657} 679}
… …
662 delete $child->{parent}; 684 delete $child->{parent};
663 $child->hide; 685 $child->hide;
664 686
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 688
667 $self->check_size (1); 689 $self->realloc;
668 $self->update;
669} 690}
670 691
671sub clear { 692sub clear {
672 my ($self) = @_; 693 my ($self) = @_;
673 694
… …
677 for (@$children) { 698 for (@$children) {
678 delete $_->{parent}; 699 delete $_->{parent};
679 $_->hide; 700 $_->hide;
680 } 701 }
681 702
682 $self->check_size; 703 $self->realloc;
683 $self->update;
684} 704}
685 705
686sub find_widget { 706sub find_widget {
687 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
688 708
… …
741sub size_request { 761sub size_request {
742 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
743} 763}
744 764
745sub size_allocate { 765sub size_allocate {
746 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
747 767
748 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
749} 769}
750 770
751############################################################################# 771#############################################################################
… …
768 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
769 $self->SUPER::update; 789 $self->SUPER::update;
770} 790}
771 791
772sub size_allocate { 792sub size_allocate {
773 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
774 794
775 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
776 $self->update; 796 $self->update
797 if $changed;
777} 798}
778 799
779sub _render { 800sub _render {
780 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
781} 802}
… …
825} 846}
826 847
827sub size_request { 848sub size_request {
828 my ($self) = @_; 849 my ($self) = @_;
829 850
830 @$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)};
831 852
832 @$self{qw(child_w child_h)} 853 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y};
855
856 ($w, $h)
833} 857}
834 858
835sub size_allocate { 859sub size_allocate {
836 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
837 861
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
840 864
841 $self->child->configure (0, 0, $w, $h); 865 $self->child->configure (0, 0, $w, $h);
… …
928 my $child = $self->{vp}->child; 952 my $child = $self->{vp}->child;
929 $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]);
930} 954}
931 955
932sub size_allocate { 956sub size_allocate {
933 my ($self, $w, $h) = @_; 957 my ($self, $w, $h, $changed) = @_;
934 958
935 $self->SUPER::size_allocate ($w, $h); 959 $self->SUPER::size_allocate ($w, $h, $changed);
936 960
937 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
938 $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]);
939} 963}
940 964
… …
987 1011
988our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
989 1013
990use CFClient::OpenGL; 1014use CFClient::OpenGL;
991 1015
992my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 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);
995 1023
996sub new { 1024sub new {
997 my $class = shift; 1025 my $class = shift;
998
999 # TODO: user_x, user_y, overwrite moveto?
1000 1026
1001 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1030 border => 0.6,
… …
1030 $h + $self->border * 2, 1056 $h + $self->border * 2,
1031 ) 1057 )
1032} 1058}
1033 1059
1034sub size_allocate { 1060sub size_allocate {
1035 my ($self, $w, $h) = @_; 1061 my ($self, $w, $h, $changed) = @_;
1062
1063 return unless $changed;
1036 1064
1037 $h -= List::Util::max 0, $self->border * 2; 1065 $h -= List::Util::max 0, $self->border * 2;
1038 $w -= List::Util::max 0, $self->border * 2; 1066 $w -= List::Util::max 0, $self->border * 2;
1039 1067
1040 $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)
… …
1064 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1065 1093
1066 my $dx = $ev->{x} - $ox; 1094 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1095 my $dy = $ev->{y} - $oy;
1068 1096
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1099
1074 $self->check_size; 1100 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1075 }; 1102 };
1076 1103
1077 } elsif ($lr ^ $td) { 1104 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1105 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1106 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1081 $self->{motion} = sub { 1108 $self->{motion} = sub {
1082 my ($ev, $x, $y) = @_; 1109 my ($ev, $x, $y) = @_;
1083 1110
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1111 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1112
1086 $self->{user_x} = $bx + $x - $ox; 1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087 $self->{user_y} = $by + $y - $oy;
1088 $self->move ($self->{user_x}, $self->{user_y});
1089 $self->update;
1090 }; 1114 };
1091 } 1115 }
1092} 1116}
1093 1117
1094sub button_up { 1118sub button_up {
… …
1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114 1138
1115 my $border = $self->border; 1139 my $border = $self->border;
1116 1140
1117 glColor @{ $self->{border_bg} }; 1141 glColor @{ $self->{border_bg} };
1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1142 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1143 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1144 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1145 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122 1146
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1147 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124 my $bg = $tex[0]; 1148 glColor @{ $self->{bg} };
1125 1149
1126 # TODO: repeat texture not scale 1150 # TODO: repeat texture not scale
1151 # solve this better(?)
1127 my $rep_x = $cw / $bg->{w}; 1152 $bg->{s} = $cw / $bg->{w};
1128 my $rep_y = $ch / $bg->{h}; 1153 $bg->{t} = $ch / $bg->{h};
1129
1130 glColor @{ $self->{bg} };
1131
1132 $bg->{s} = $rep_x;
1133 $bg->{t} = $rep_y;
1134 $bg->{wrap_mode} = 1;
1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 } 1155 }
1137 1156
1138 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
1139 1158
… …
1169 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1170 1189
1171 $child->set_parent ($self); 1190 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1173 1192
1174 $self->check_size (1); 1193 $self->realloc;
1175} 1194}
1176 1195
1177# 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?
1178sub clear { 1197sub clear {
1179 my ($self) = @_; 1198 my ($self) = @_;
… …
1184 for (@children) { 1203 for (@children) {
1185 delete $_->{parent}; 1204 delete $_->{parent};
1186 $_->hide; 1205 $_->hide;
1187 } 1206 }
1188 1207
1189 $self->check_size (1); 1208 $self->realloc;
1190 $self->update;
1191} 1209}
1192 1210
1193sub get_wh { 1211sub get_wh {
1194 my ($self) = @_; 1212 my ($self) = @_;
1195 1213
… …
1222 (sum @$hs), 1240 (sum @$hs),
1223 ) 1241 )
1224} 1242}
1225 1243
1226sub size_allocate { 1244sub size_allocate {
1227 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1228 1246
1229 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1230 1248
1231 my $req_w = (sum @$ws) || 1; 1249 my $req_w = (sum @$ws) || 1;
1232 my $req_h = (sum @$hs) || 1; 1250 my $req_h = (sum @$hs) || 1;
… …
1291 } 1309 }
1292} 1310}
1293 1311
1294############################################################################# 1312#############################################################################
1295 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
1296package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1297 1375
1298# TODO: wrap into common Box base class
1299
1300our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1301 1377
1302sub size_request { 1378sub new {
1303 my ($self) = @_; 1379 my $class = shift;
1304 1380
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1306 1382 vertical => 0,
1307 ( 1383 @_,
1308 (List::Util::sum map $_->[0], @alloc),
1309 (List::Util::max map $_->[1], @alloc),
1310 ) 1384 )
1311} 1385}
1312 1386
1313sub size_allocate {
1314 my ($self, $w, $h) = @_;
1315
1316 ($h, $w) = ($w, $h);
1317
1318 my $children = $self->{children};
1319
1320 my @h = map $_->{req_w}, @$children;
1321
1322 my $req_h = List::Util::sum @h;
1323
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } else {
1328 my $exp = List::Util::sum map $_->{expand}, @$children;
1329 $exp ||= 1;
1330
1331 for (0 .. $#$children) {
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 }
1338 }
1339
1340 CFClient::UI::harmonize \@h;
1341
1342 my $y = 0;
1343 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_];
1346 $child->configure ($y, 0, $h, $w);
1347
1348 $y += $h;
1349 }
1350
1351 1
1352}
1353
1354############################################################################# 1387#############################################################################
1355 1388
1356package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1357 1390
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1361 1392
1362sub size_request { 1393sub new {
1363 my ($self) = @_; 1394 my $class = shift;
1364 1395
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1366 1397 vertical => 1,
1367 ( 1398 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1399 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1400}
1411 1401
1412############################################################################# 1402#############################################################################
1413 1403
1414package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
1477 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1478 1468
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1481 1471
1472 $self->realloc;
1482 $self->update; 1473 $self->update;
1483 $self->check_size;
1484} 1474}
1485 1475
1486sub set_markup { 1476sub set_markup {
1487 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1488 1478
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1483
1494 $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;
1495 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1496 1486
1487 $self->realloc;
1497 $self->update; 1488 $self->update;
1498 $self->check_size;
1499} 1489}
1500 1490
1501sub size_request { 1491sub size_request {
1502 my ($self) = @_; 1492 my ($self) = @_;
1503 1493
… …
1524 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1525 ) 1515 )
1526} 1516}
1527 1517
1528sub size_allocate { 1518sub size_allocate {
1529 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1530 1520
1531 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1532} 1523}
1533 1524
1534sub set_fontsize { 1525sub set_fontsize {
1535 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1536 1527
1537 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1529 delete $self->{texture};
1539 1530
1540 $self->update; 1531 $self->realloc;
1541 $self->check_size;
1542} 1532}
1543 1533
1544sub _draw { 1534sub _draw {
1545 my ($self) = @_; 1535 my ($self) = @_;
1546 1536
… …
1626sub set_text { 1616sub set_text {
1627 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1628 1618
1629 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1620 $self->_set_text ($text);
1631 $self->update; 1621
1632 $self->check_size; 1622 $self->realloc;
1633} 1623}
1634 1624
1635sub get_text { 1625sub get_text {
1636 $_[0]{text} 1626 $_[0]{text}
1637} 1627}
… …
1670 } elsif ($uni) { 1660 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1672 } 1662 }
1673 1663
1674 $self->_set_text ($text); 1664 $self->_set_text ($text);
1675 $self->update; 1665
1676 $self->check_size; 1666 $self->realloc;
1677} 1667}
1678 1668
1679sub focus_in { 1669sub focus_in {
1680 my ($self) = @_; 1670 my ($self) = @_;
1681 1671
… …
2188 $self->update; 2178 $self->update;
2189 2179
2190 $self 2180 $self
2191} 2181}
2192 2182
2183sub changed { }
2184
2193sub set_range { 2185sub set_range {
2194 my ($self, $range) = @_; 2186 my ($self, $range) = @_;
2195 2187
2196 ($range, $self->{range}) = ($self->{range}, $range); 2188 ($range, $self->{range}) = ($self->{range}, $range);
2197 2189
… …
2386 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2387 $self->reflow; 2379 $self->reflow;
2388} 2380}
2389 2381
2390sub size_allocate { 2382sub size_allocate {
2391 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2392 2384
2393 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2394 2388
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2398 2392
… …
2592 state => 0, 2586 state => 0,
2593 on_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2594 @_ 2588 @_
2595 ); 2589 );
2596 2590
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2591 $self
2603} 2592}
2604 2593
2605sub toggle_flopper { 2594sub toggle_flopper {
2606 my ($self) = @_; 2595 my ($self) = @_;
2607 2596
2608 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2598}
2620 2599
2621############################################################################# 2600#############################################################################
2622 2601
2623package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2655 2634
2656 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2657} 2636}
2658 2637
2659sub size_allocate { 2638sub size_allocate {
2660 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2661 2640
2641 return unless $changed;
2642
2662 $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 });
2663} 2662}
2664 2663
2665sub _draw { 2664sub _draw {
2666 my ($self) = @_; 2665 my ($self) = @_;
2667 2666
… …
2684 glVertex $w, $h; 2683 glVertex $w, $h;
2685 glVertex $w, 0; 2684 glVertex $w, 0;
2686 glEnd; 2685 glEnd;
2687 2686
2688 glTranslate 2 - 0.375, 2 - 0.375; 2687 glTranslate 2 - 0.375, 2 - 0.375;
2688
2689 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2690} 2690}
2691 2691
2692############################################################################# 2692#############################################################################
2693 2693
… …
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809 2809
2810 $row++; 2810 $row++;
2811 } 2811 }
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817} 2812}
2818 2813
2819############################################################################# 2814#############################################################################
2820 2815
2821package CFClient::UI::Menu; 2816package CFClient::UI::Menu;
… …
3007use CFClient::OpenGL; 3002use CFClient::OpenGL;
3008 3003
3009sub new { 3004sub new {
3010 my $class = shift; 3005 my $class = shift;
3011 3006
3012 $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
3013 visible => 1, 3008 visible => 1,
3014 @_, 3009 @_,
3015 ) 3010 );
3011
3012 Scalar::Util::weaken ($self->{root} = $self);
3013
3014 $self
3016} 3015}
3017 3016
3018sub configure { 3017sub configure {
3019 my ($self, $x, $y, $w, $h) = @_; 3018 my ($self, $x, $y, $w, $h) = @_;
3020 3019
3021 $self->{w} = $w; 3020 $self->{w} = $w;
3022 $self->{h} = $h; 3021 $self->{h} = $h;
3023} 3022}
3024 3023
3025sub check_size { 3024sub reconfigure {
3026 my ($self) = @_; 3025 my ($self) = @_;
3027 3026
3027 $self->SUPER::reconfigure;
3028
3028 $self->size_allocate ($self->{w}, $self->{h}) 3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3029 if $self->{w}; 3030 if $self->{w};
3030} 3031}
3031 3032
3032sub size_request { 3033sub size_request {
3033 my ($self) = @_; 3034 my ($self) = @_;
3034 3035
3035 ($self->{w}, $self->{h}) 3036 ($self->{w}, $self->{h})
3036} 3037}
3037 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
3038sub size_allocate { 3053sub size_allocate {
3039 my ($self, $w, $h) = @_; 3054 my ($self, $w, $h, $changed) = @_;
3040 3055
3041 for my $child ($self->children) { 3056 for my $child ($self->children) {
3042 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)};
3043 3058
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3059 $X = $child->{force_x} if exists $child->{force_x};
3045 if exists $child->{req_x}; 3060 $Y = $child->{force_y} if exists $child->{force_y};
3046 3061
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3062 $X = _to_pixel $X, $W, $self->{w};
3048 if exists $child->{req_y}; 3063 $Y = _to_pixel $Y, $H, $self->{h};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055 3064
3056 $child->configure ($X, $Y, $W, $H); 3065 $child->configure ($X, $Y, $W, $H);
3057 } 3066 }
3058} 3067}
3059 3068
… …
3070} 3079}
3071 3080
3072sub update { 3081sub update {
3073 my ($self) = @_; 3082 my ($self) = @_;
3074 3083
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3084 $::WANT_REFRESH++;
3077} 3085}
3078 3086
3079sub add { 3087sub add {
3080 my ($self, @children) = @_; 3088 my ($self, @children) = @_;
3081 3089
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3090 $_->{is_toplevel} = 1
3090 3091 for @children;
3091 # integerise window positions
3092 $child->{x} = int $child->{x};
3093 $child->{y} = int $child->{y};
3094 }
3095 3092
3096 $self->SUPER::add (@children); 3093 $self->SUPER::add (@children);
3097} 3094}
3098 3095
3099sub remove { 3096sub remove {
3100 my ($self, @children) = @_; 3097 my ($self, @children) = @_;
3101 3098
3102 $self->SUPER::remove (@children); 3099 $self->SUPER::remove (@children);
3100
3101 delete $self->{is_toplevel}
3102 for @children;
3103 3103
3104 while (@children) { 3104 while (@children) {
3105 my $w = pop @children; 3105 my $w = pop @children;
3106 push @children, $w->children; 3106 push @children, $w->children;
3107 $w->set_invisible; 3107 $w->set_invisible;
… …
3126 while ($self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
3127 $_->() 3127 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
3129 } 3129 }
3130 3130
3131 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3132 my @queue; 3132 my @queue;
3133 3133
3134 for (;;) { 3134 while () {
3135 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
3136 #TODO use array-of-depth approach 3136 #TODO use array-of-depth approach
3137 3137
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3139 @queue, values %{delete $self->{check_size}}; 3139 @queue, values %{delete $self->{realloc}};
3140 } 3140 }
3141 3141
3142 my $widget = pop @queue || last; 3142 my $widget = pop @queue || last;
3143 3143
3144 defined $widget->{visible} or last; # do not resize invisible widgets 3144 $widget->{visible} or last; # do not resize invisible widgets
3145 3145
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147 ? @$widget{qw(user_w user_h)} 3147 ? @$widget{qw(force_w force_h)}
3148 : $widget->size_request; 3148 : $widget->size_request;
3149 3149
3150 if (delete $widget->{force_alloc} 3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3151
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3152 $w = $min_size if $w < $min_size;
3153 3153 $h = $min_size if $h < $min_size;
3154
3154 $widget->{req_w} = $w; 3155 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3156 $widget->{req_h} = $h;
3156 3157
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3158 3159
3159 $widget->{parent}->check_size 3160 push @queue, $widget->{parent}
3160 if $widget->{parent}; 3161 if $widget->{parent};
3161 }
3162 } 3162 }
3163 } 3163 }
3164 3164
3165 while ($self->{size_alloc}) { 3165 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 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;
3168 3174
3169 $w = 0 if $w < 0; 3175 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3176 $h = 0 if $h < 0;
3171 3177
3178 $w = int $w + 0.5;
3179 $h = int $h + 0.5;
3180
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3182
3172 $widget->{w} = $w; 3183 $widget->{w} = $w;
3173 $widget->{h} = $h; 3184 $widget->{h} = $h;
3185
3174 $widget->emit (size_allocate => $w, $h); 3186 $widget->emit (size_allocate => $w, $h, $changed);
3175 } 3187 }
3176 } 3188 }
3177 3189
3178 while ($self->{post_alloc_hook}) { 3190 while ($self->{post_alloc_hook}) {
3179 $_->() 3191 $_->()

Diff Legend

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