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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.259 by root, Tue May 30 07:13:09 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
29 } 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};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
40 if (!$GRAB) { 45 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
43 48
44 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
45 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
46 53
47 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
48 55
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 57
51 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 59 $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 } 60 }
63 61
64 return; 62 return;
65 } 63 }
66 } 64 }
… …
172sub rescale_widgets { 170sub rescale_widgets {
173 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
174 172
175 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $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}; 179 $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}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
183 } 188 }
184 } 189 }
185 190
186 reconfigure_widgets; 191 reconfigure_widgets;
187} 192}
… …
196 201
197sub new { 202sub new {
198 my $class = shift; 203 my $class = shift;
199 204
200 my $self = bless { 205 my $self = bless {
201 x => 0, 206 x => "center",
202 y => 0, 207 y => "center",
203 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
204 can_events => 1, 211 can_events => 1,
205 @_ 212 @_
206 }, $class; 213 }, $class;
214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 216
208 for (keys %$self) { 217 for (keys %$self) {
209 if (/^on_(.*)$/) { 218 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
211 } 220 }
212 } 221 }
213 222
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
221 } 233 }
222 234
223 $self 235 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 236}
235 237
236sub destroy { 238sub destroy {
237 my ($self) = @_; 239 my ($self) = @_;
238 240
… …
240 %$self = (); 242 %$self = ();
241} 243}
242 244
243sub show { 245sub show {
244 my ($self) = @_; 246 my ($self) = @_;
247
245 return if $self->{parent}; 248 return if $self->{parent};
246 249
247 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
248}
249
250sub center {
251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260} 251}
261 252
262sub set_visible { 253sub set_visible {
263 my ($self) = @_; 254 my ($self) = @_;
264 255
265 return if $self->{visible}; 256 return if $self->{visible};
266 257
267 $self->{root} = $self->{parent}{root}; 258 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1; 259 $self->{visible} = $self->{parent}{visible} + 1;
269 260
270 $self->emit (visibility_change => 1) 261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
271} 266}
272 267
273sub set_invisible { 268sub set_invisible {
274 my ($self) = @_; 269 my ($self) = @_;
275 270
276 return unless $self->{visible}; 271 return unless $self->{visible};
277 272
278 # broken show/hide model 273 $_->set_invisible for $self->children;
279 274
280 delete $self->{root}; 275 delete $self->{root};
281 delete $self->{visible}; 276 delete $self->{visible};
282 277
283 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
284 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
285 280
286 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
287 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
288 283
289 $self->focus_out; 284 $self->focus_out;
290 285
291 $self->emit (visibility_change => 0); 286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
292} 304}
293 305
294sub hide { 306sub hide {
295 my ($self) = @_; 307 my ($self) = @_;
296 308
… …
298 310
299 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
300 if $self->{parent}; 312 if $self->{parent};
301} 313}
302 314
303sub move { 315sub move_abs {
304 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
305 317
306 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
307 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
308 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
309 321
310 $self->update; 322 $self->update;
311} 323}
312 324
313sub set_size { 325sub set_size {
314 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
315 327
316 $self->{def_w} = $w; 328 $self->{force_w} = $w;
317 $self->{def_h} = $h; 329 $self->{force_h} = $h;
318 330
319 $self->check_size; 331 $self->realloc;
320} 332}
321 333
322sub size_request { 334sub size_request {
323 require Carp; 335 require Carp;
324 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
326 338
327sub configure { 339sub configure {
328 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
329 341
330 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
331 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
332 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
333 347
334 # use alignment to adjust x, y 348 # use alignment to adjust x, y
335 349
336 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
337 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
338
339 ($w, $h) = ($w2, $h2);
340 } 352 }
341 353
342 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
343 $self->{x} = $x; 355 $self->{x} = $x;
344 $self->{y} = $y; 356 $self->{y} = $y;
345 $self->update; 357 $self->update;
346 } 358 }
347 359
348 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
350 } 367 }
351} 368}
352 369
353sub size_allocate { 370sub size_allocate {
354 # nothing to be done 371 # nothing to be done
355}
356
357sub reconfigure {
358 my ($self) = @_;
359
360 $self->check_size (1);
361 $self->update;
362} 372}
363 373
364sub children { 374sub children {
365} 375}
366 376
… …
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
449 529
450sub draw { 530sub draw {
451 my ($self) = @_; 531 my ($self) = @_;
452 532
453 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
470 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
471 glEnd; 551 glEnd;
472 glDisable GL_BLEND; 552 glDisable GL_BLEND;
473 } 553 }
474 554
475 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
476 glPushMatrix; 556 glPushMatrix;
477 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
479 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
491 my ($self) = @_; 571 my ($self) = @_;
492 572
493 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
494} 574}
495 575
496sub find_widget {
497 my ($self, $x, $y) = @_;
498
499 return () unless $self->{can_events};
500
501 return $self
502 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505 ()
506}
507
508sub set_parent {
509 my ($self, $parent) = @_;
510
511 Scalar::Util::weaken ($self->{parent} = $parent);
512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515 $self->check_size;
516}
517
518sub check_size {
519 my ($self, $forced) = @_;
520
521 $self->{force_alloc} = 1 if $forced;
522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
523}
524
525sub update {
526 my ($self) = @_;
527
528 $self->{parent}->update
529 if $self->{parent};
530}
531
532sub connect {
533 my ($self, $signal, $cb) = @_;
534
535 push @{ $self->{signal_cb}{$signal} }, $cb;
536}
537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
544sub emit {
545 my ($self, $signal, @args) = @_;
546
547 $self->_emit ($signal, @args)
548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
553}
554
555sub DESTROY { 576sub DESTROY {
556 my ($self) = @_; 577 my ($self) = @_;
557 578
558 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
559 #$self->deactivate; 580 #$self->deactivate;
… …
615 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
616 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
617} 638}
618 639
619sub size_request { 640sub size_request {
620 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
621} 644}
622 645
623sub draw { } 646sub draw { }
624 647
625############################################################################# 648#############################################################################
… …
654 $self->{children} = [ 677 $self->{children} = [
655 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
656 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
657 ]; 680 ];
658 681
659 $self->check_size (1); 682 $self->realloc;
660 $self->update;
661} 683}
662 684
663sub children { 685sub children {
664 @{ $_[0]{children} } 686 @{ $_[0]{children} }
665} 687}
… …
670 delete $child->{parent}; 692 delete $child->{parent};
671 $child->hide; 693 $child->hide;
672 694
673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674 696
675 $self->check_size (1); 697 $self->realloc;
676 $self->update;
677} 698}
678 699
679sub clear { 700sub clear {
680 my ($self) = @_; 701 my ($self) = @_;
681 702
… …
685 for (@$children) { 706 for (@$children) {
686 delete $_->{parent}; 707 delete $_->{parent};
687 $_->hide; 708 $_->hide;
688 } 709 }
689 710
690 $self->check_size; 711 $self->realloc;
691 $self->update;
692} 712}
693 713
694sub find_widget { 714sub find_widget {
695 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
696 716
… …
833} 853}
834 854
835sub size_request { 855sub size_request {
836 my ($self) = @_; 856 my ($self) = @_;
837 857
838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
839 859
840 $w = 10 if $self->{scroll_x}; 860 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y}; 861 $h = 10 if $self->{scroll_y};
842 862
843 ($w, $h) 863 ($w, $h)
844} 864}
845 865
846sub size_allocate { 866sub size_allocate {
847 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
848 868
869 my $child = $self->child;
870
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851 873
852 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
853 $self->update; 875 $self->update;
854} 876}
855 877
… …
998 1020
999our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
1000 1022
1001use CFClient::OpenGL; 1023use CFClient::OpenGL;
1002 1024
1003my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1006 1032
1007sub new { 1033sub new {
1008 my $class = shift; 1034 my $class = shift;
1009 1035
1010 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1039 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1016 @_ 1043 @_
1017 ); 1044 );
1018 1045
1019 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
1020 align => 0, 1047 align => 0,
… …
1073 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1074 1101
1075 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1077 1104
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1107
1083 $self->check_size; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1084 }; 1110 };
1085 1111
1086 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1116 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1092 1118
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1120
1095 $self->{user_x} = $bx + $x - $ox; 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy;
1097
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1122 };
1101 } 1123 }
1102} 1124}
1103 1125
1104sub button_up { 1126sub button_up {
… …
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1146
1125 my $border = $self->border; 1147 my $border = $self->border;
1126 1148
1127 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1154
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1135 1157
1136 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1163 }
1147 1164
1148 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1149 1166
… …
1179 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1180 1197
1181 $child->set_parent ($self); 1198 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1183 1200
1184 $self->check_size (1); 1201 $self->realloc;
1185} 1202}
1186 1203
1187# TODO: move to container class maybe? send children a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1205sub clear {
1189 my ($self) = @_; 1206 my ($self) = @_;
… …
1194 for (@children) { 1211 for (@children) {
1195 delete $_->{parent}; 1212 delete $_->{parent};
1196 $_->hide; 1213 $_->hide;
1197 } 1214 }
1198 1215
1199 $self->check_size (1); 1216 $self->realloc;
1200 $self->update;
1201} 1217}
1202 1218
1203sub get_wh { 1219sub get_wh {
1204 my ($self) = @_; 1220 my ($self) = @_;
1205 1221
… …
1413 ellipsise => 3, # end 1429 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1415 fontsize => 1, 1431 fontsize => 1,
1416 align => -1, 1432 align => -1,
1417 valign => -1, 1433 valign => -1,
1418 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1419 can_events => 0, 1436 can_events => 0,
1420 %arg 1437 %arg
1421 ); 1438 );
1422 1439
1423 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1459 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1460 1477
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1463 1480
1481 $self->realloc;
1464 $self->update; 1482 $self->update;
1465 $self->check_size;
1466} 1483}
1467 1484
1468sub set_markup { 1485sub set_markup {
1469 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1470 1487
… …
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1492
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1478 1495
1496 $self->realloc;
1479 $self->update; 1497 $self->update;
1480 $self->check_size;
1481} 1498}
1482 1499
1483sub size_request { 1500sub size_request {
1484 my ($self) = @_; 1501 my ($self) = @_;
1485 1502
… …
1499 1516
1500 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1502 } 1519 }
1503 1520
1504 ( 1521 ($w, $h)
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1522}
1509 1523
1510sub size_allocate { 1524sub size_allocate {
1511 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1512 1526
… …
1517 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1518 1532
1519 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1534 delete $self->{texture};
1521 1535
1522 $self->update; 1536 $self->realloc;
1523 $self->check_size;
1524} 1537}
1525 1538
1526sub _draw { 1539sub _draw {
1527 my ($self) = @_; 1540 my ($self) = @_;
1528 1541
… …
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1551
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1540 1553
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1544 1557
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1548 1561
1549 $tex 1562 $tex
1550 }; 1563 };
1551 1564
… …
1608sub set_text { 1621sub set_text {
1609 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1610 1623
1611 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1625 $self->_set_text ($text);
1613 $self->update; 1626
1614 $self->check_size; 1627 $self->realloc;
1615} 1628}
1616 1629
1617sub get_text { 1630sub get_text {
1618 $_[0]{text} 1631 $_[0]{text}
1619} 1632}
… …
1652 } elsif ($uni) { 1665 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1654 } 1667 }
1655 1668
1656 $self->_set_text ($text); 1669 $self->_set_text ($text);
1657 $self->update; 1670
1658 $self->check_size; 1671 $self->realloc;
1659} 1672}
1660 1673
1661sub focus_in { 1674sub focus_in {
1662 my ($self) = @_; 1675 my ($self) = @_;
1663 1676
… …
1790 1803
1791sub new { 1804sub new {
1792 my $class = shift; 1805 my $class = shift;
1793 1806
1794 $class->SUPER::new ( 1807 $class->SUPER::new (
1795 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1796 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1798 can_hover => 1, 1812 can_hover => 1,
1799 align => 0, 1813 align => 0,
1800 valign => 0, 1814 valign => 0,
… …
1847 1861
1848sub new { 1862sub new {
1849 my $class = shift; 1863 my $class = shift;
1850 1864
1851 $class->SUPER::new ( 1865 $class->SUPER::new (
1852 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1853 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 1872 state => 0,
… …
1861} 1876}
1862 1877
1863sub size_request { 1878sub size_request {
1864 my ($self) = @_; 1879 my ($self) = @_;
1865 1880
1866 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1867} 1882}
1868 1883
1869sub button_down { 1884sub button_down {
1870 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1871 1886
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1876 } 1891 }
1877} 1892}
1878 1893
1879sub _draw { 1894sub _draw {
1880 my ($self) = @_; 1895 my ($self) = @_;
1881 1896
1882 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1883 1898
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 1900
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 1904
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 1906
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 1908
… …
2156 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2177 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2163 vertical => 0, 2180 vertical => 0,
2164 can_hover => 1, 2181 can_hover => 1,
2165 inner_pad => 0.02, 2182 inner_pad => 0.02,
2166 @_ 2183 @_
2167 ); 2184 );
… …
2170 $self->update; 2187 $self->update;
2171 2188
2172 $self 2189 $self
2173} 2190}
2174 2191
2192sub changed { }
2193
2175sub set_range { 2194sub set_range {
2176 my ($self, $range) = @_; 2195 my ($self, $range) = @_;
2177 2196
2178 ($range, $self->{range}) = ($self->{range}, $range); 2197 ($range, $self->{range}) = ($self->{range}, $range);
2179 2198
… …
2205} 2224}
2206 2225
2207sub size_request { 2226sub size_request {
2208 my ($self) = @_; 2227 my ($self) = @_;
2209 2228
2210 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2230}
2215 2231
2216sub button_down { 2232sub button_down {
2217 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2218 2234
… …
2603} 2619}
2604 2620
2605sub set_tooltip_from { 2621sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2607 2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2608 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2636 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2638 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2625 2650
2626sub size_allocate { 2651sub size_allocate {
2627 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2628 2653
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2630} 2673}
2631 2674
2632sub _draw { 2675sub _draw {
2633 my ($self) = @_; 2676 my ($self) = @_;
2634 2677
… …
2651 glVertex $w, $h; 2694 glVertex $w, $h;
2652 glVertex $w, 0; 2695 glVertex $w, 0;
2653 glEnd; 2696 glEnd;
2654 2697
2655 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2656 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2657} 2701}
2658 2702
2659############################################################################# 2703#############################################################################
2660 2704
… …
2825 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 2870 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2828 2872
2829 $self->show; 2873 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 2875}
2832 2876
2833sub mouse_motion { 2877sub mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2835 2879
… …
2969use CFClient::OpenGL; 3013use CFClient::OpenGL;
2970 3014
2971sub new { 3015sub new {
2972 my $class = shift; 3016 my $class = shift;
2973 3017
2974 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
2975 visible => 1, 3019 visible => 1,
2976 @_, 3020 @_,
2977 ) 3021 );
2978}
2979 3022
2980sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3024
2983 $self->{w} = $w; 3025 $self
2984 $self->{h} = $h;
2985}
2986
2987sub check_size {
2988 my ($self) = @_;
2989
2990 $self->size_allocate ($self->{w}, $self->{h})
2991 if $self->{w};
2992} 3026}
2993 3027
2994sub size_request { 3028sub size_request {
2995 my ($self) = @_; 3029 my ($self) = @_;
2996 3030
2997 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
2998} 3046}
2999 3047
3000sub size_allocate { 3048sub size_allocate {
3001 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
3002 3050
3003 for my $child ($self->children) { 3051 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3053
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3008 3056
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
3011
3012 delete @$child{qw(req_x req_y)};
3013
3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016 3059
3017 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
3018 } 3061 }
3019} 3062}
3020 3063
… …
3031} 3074}
3032 3075
3033sub update { 3076sub update {
3034 my ($self) = @_; 3077 my ($self) = @_;
3035 3078
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
3038} 3080}
3039 3081
3040sub add { 3082sub add {
3041 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
3042 3084
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3085 $_->{is_toplevel} = 1
3045 3086 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3087
3051 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058} 3089}
3059 3090
3060sub remove { 3091sub remove {
3061 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3062 3093
3063 $self->SUPER::remove (@children); 3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3064 3098
3065 while (@children) { 3099 while (@children) {
3066 my $w = pop @children; 3100 my $w = pop @children;
3067 push @children, $w->children; 3101 push @children, $w->children;
3068 $w->set_invisible; 3102 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
3088 $_->() 3122 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3090 } 3124 }
3091 3125
3092 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
3093 my @queue; 3127 my @queue;
3094 3128
3095 for (;;) { 3129 while () {
3096 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
3097 #TODO use array-of-depth approach 3131 #TODO use array-of-depth approach
3098 3132
3133 use sort 'stable';
3134
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3100 @queue, values %{delete $self->{check_size}}; 3136 @queue, values %{delete $self->{realloc}};
3101 } 3137 }
3102 3138
3103 my $widget = pop @queue || last; 3139 my $widget = pop @queue || last;
3104 3140
3105 defined $widget->{visible} or last; # do not resize invisible widgets 3141 $widget->{visible} or last; # do not resize invisible widgets
3106 3142
3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108 ? @$widget{qw(def_w def_h)}
3109 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
3110 3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3111 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114
3115 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
3117 3155
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
3119 3157
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3122 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3123 } 3167 }
3124 } 3168 }
3125 3169
3126 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3178
3130 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3132 3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3133 $widget->{w} = $w; 3186 $widget->{w} = $w;
3134 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3135 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3136 } 3191 }
3137 } 3192 }
3138 3193
3139 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3140 $_->() 3195 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3142 } 3197 }
3198
3143 3199
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3147 3203

Diff Legend

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