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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.259 by root, Tue May 30 07:13:09 2006 UTC

… …
26 26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
31 } 33 }
32 34
33 $layout 35 $layout
34} 36}
35 37
36sub set_layout { 38sub set_layout {
37 my ($layout) = @_; 39 my ($layout) = @_;
40
38 $LAYOUT = $layout; 41 $LAYOUT = $layout;
39} 42}
40 43
41sub check_tooltip { 44sub check_tooltip {
42 if (!$GRAB) { 45 if (!$GRAB) {
… …
207 h => undef, 210 h => undef,
208 can_events => 1, 211 can_events => 1,
209 @_ 212 @_
210 }, $class; 213 }, $class;
211 214
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); 215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223 216
224 for (keys %$self) { 217 for (keys %$self) {
225 if (/^on_(.*)$/) { 218 if (/^on_(.*)$/) {
226 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
227 } 220 }
228 } 221 }
229 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
233 }
234
230 $self 235 $self
231} 236}
232 237
233sub destroy { 238sub destroy {
234 my ($self) = @_; 239 my ($self) = @_;
… …
350 $self->{x} = $x; 355 $self->{x} = $x;
351 $self->{y} = $y; 356 $self->{y} = $y;
352 $self->update; 357 $self->update;
353 } 358 }
354 359
355 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356 return unless $self->{visible}; 361 return unless $self->{visible};
357 362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 366 $self->{root}{size_alloc}{$self+0} = $self;
359 } 367 }
360} 368}
361 369
362sub size_allocate { 370sub size_allocate {
363 # nothing to be done 371 # nothing to be done
… …
463 471
464sub set_parent { 472sub set_parent {
465 my ($self, $parent) = @_; 473 my ($self, $parent) = @_;
466 474
467 Scalar::Util::weaken ($self->{parent} = $parent); 475 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 476 $self->set_visible if $parent->{visible};
470} 477}
471 478
472sub connect { 479sub connect {
473 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
… …
494 501
495sub realloc { 502sub realloc {
496 my ($self) = @_; 503 my ($self) = @_;
497 504
498 if ($self->{visible}) { 505 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 506 return if $self->{root}{realloc}{$self+0};
500 507
501 $self->{root}{realloc}{$self} = $self; 508 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 509 $self->{root}->update;
503 } else { 510 } else {
504 delete $self->{req_w}; 511 delete $self->{req_w};
512 delete $self->{req_h};
505 } 513 }
506} 514}
507 515
508sub update { 516sub update {
509 my ($self) = @_; 517 my ($self) = @_;
… …
542 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
543 glEnd; 551 glEnd;
544 glDisable GL_BLEND; 552 glDisable GL_BLEND;
545 } 553 }
546 554
547 if ($ENV{CFPLUS_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 556 glPushMatrix;
549 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
761sub size_request { 769sub size_request {
762 $_[0]{children}[0]->size_request 770 $_[0]{children}[0]->size_request
763} 771}
764 772
765sub size_allocate { 773sub size_allocate {
766 my ($self, $w, $h, $changed) = @_; 774 my ($self, $w, $h) = @_;
767 775
768 $self->{children}[0]->configure (0, 0, $w, $h); 776 $self->{children}[0]->configure (0, 0, $w, $h);
769} 777}
770 778
771############################################################################# 779#############################################################################
… …
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 797 $self->SUPER::update;
790} 798}
791 799
792sub size_allocate { 800sub size_allocate {
793 my ($self, $w, $h, $changed) = @_; 801 my ($self, $w, $h) = @_;
794 802
795 $self->SUPER::size_allocate ($w, $h, $changed); 803 $self->SUPER::size_allocate ($w, $h);
796 $self->update 804 $self->update;
797 if $changed;
798} 805}
799 806
800sub _render { 807sub _render {
801 $_[0]{children}[0]->draw; 808 $_[0]{children}[0]->draw;
802} 809}
… …
846} 853}
847 854
848sub size_request { 855sub size_request {
849 my ($self) = @_; 856 my ($self) = @_;
850 857
851 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)};
852 859
853 $w = 10 if $self->{scroll_x}; 860 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 861 $h = 10 if $self->{scroll_y};
855 862
856 ($w, $h) 863 ($w, $h)
857} 864}
858 865
859sub size_allocate { 866sub size_allocate {
860 my ($self, $w, $h, $changed) = @_; 867 my ($self, $w, $h) = @_;
861 868
869 my $child = $self->child;
870
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 873
865 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
866 $self->update; 875 $self->update;
867} 876}
868 877
… …
952 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
953 $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]);
954} 963}
955 964
956sub size_allocate { 965sub size_allocate {
957 my ($self, $w, $h, $changed) = @_; 966 my ($self, $w, $h) = @_;
958 967
959 $self->SUPER::size_allocate ($w, $h, $changed); 968 $self->SUPER::size_allocate ($w, $h);
960 969
961 my $child = $self->{vp}->child; 970 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 972}
964 973
… …
1026 1035
1027 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1039 border => 0.6,
1031 is_toplevel => 1,
1032 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1033 @_ 1043 @_
1034 ); 1044 );
1035 1045
1036 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
1037 align => 0, 1047 align => 0,
… …
1056 $h + $self->border * 2, 1066 $h + $self->border * 2,
1057 ) 1067 )
1058} 1068}
1059 1069
1060sub size_allocate { 1070sub size_allocate {
1061 my ($self, $w, $h, $changed) = @_; 1071 my ($self, $w, $h) = @_;
1062
1063 return unless $changed;
1064 1072
1065 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
1066 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
1067 1075
1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1240 (sum @$hs), 1248 (sum @$hs),
1241 ) 1249 )
1242} 1250}
1243 1251
1244sub size_allocate { 1252sub size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1253 my ($self, $w, $h) = @_;
1246 1254
1247 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1248 1256
1249 my $req_w = (sum @$ws) || 1; 1257 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1258 my $req_h = (sum @$hs) || 1;
… …
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1337 )
1330} 1338}
1331 1339
1332sub size_allocate { 1340sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1341 my ($self, $w, $h) = @_;
1334 1342
1335 my $space = $self->{vertical} ? $h : $w; 1343 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1344 my $children = $self->{children};
1337 1345
1338 my @req; 1346 my @req;
… …
1421 ellipsise => 3, # end 1429 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1423 fontsize => 1, 1431 fontsize => 1,
1424 align => -1, 1432 align => -1,
1425 valign => -1, 1433 valign => -1,
1426 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1427 can_events => 0, 1436 can_events => 0,
1428 %arg 1437 %arg
1429 ); 1438 );
1430 1439
1431 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1507 1516
1508 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1510 } 1519 }
1511 1520
1512 ( 1521 ($w, $h)
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1522}
1517 1523
1518sub size_allocate { 1524sub size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1525 my ($self, $w, $h) = @_;
1520 1526
1521 delete $self->{texture} 1527 delete $self->{texture};
1522 if $changed;
1523} 1528}
1524 1529
1525sub set_fontsize { 1530sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1527 1532
… …
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1551
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1548 1553
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1552 1557
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1556 1561
1557 $tex 1562 $tex
1558 }; 1563 };
1559 1564
… …
1798 1803
1799sub new { 1804sub new {
1800 my $class = shift; 1805 my $class = shift;
1801 1806
1802 $class->SUPER::new ( 1807 $class->SUPER::new (
1803 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1804 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1806 can_hover => 1, 1812 can_hover => 1,
1807 align => 0, 1813 align => 0,
1808 valign => 0, 1814 valign => 0,
… …
1855 1861
1856sub new { 1862sub new {
1857 my $class = shift; 1863 my $class = shift;
1858 1864
1859 $class->SUPER::new ( 1865 $class->SUPER::new (
1860 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1861 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1872 state => 0,
… …
1869} 1876}
1870 1877
1871sub size_request { 1878sub size_request {
1872 my ($self) = @_; 1879 my ($self) = @_;
1873 1880
1874 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1875} 1882}
1876 1883
1877sub button_down { 1884sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1879 1886
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1884 } 1891 }
1885} 1892}
1886 1893
1887sub _draw { 1894sub _draw {
1888 my ($self) = @_; 1895 my ($self) = @_;
1889 1896
1890 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1891 1898
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 1900
1894 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;
1895 1904
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 1906
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 1908
… …
2164 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2177 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2171 vertical => 0, 2180 vertical => 0,
2172 can_hover => 1, 2181 can_hover => 1,
2173 inner_pad => 0.02, 2182 inner_pad => 0.02,
2174 @_ 2183 @_
2175 ); 2184 );
… …
2215} 2224}
2216 2225
2217sub size_request { 2226sub size_request {
2218 my ($self) = @_; 2227 my ($self) = @_;
2219 2228
2220 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2230}
2225 2231
2226sub button_down { 2232sub button_down {
2227 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2228 2234
… …
2378 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2385 $self->reflow;
2380} 2386}
2381 2387
2382sub size_allocate { 2388sub size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2389 my ($self, $w, $h) = @_;
2384 2390
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2391 $self->SUPER::size_allocate ($w, $h);
2386
2387 return unless $changed;
2388 2392
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2392 2396
… …
2615} 2619}
2616 2620
2617sub set_tooltip_from { 2621sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2619 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
2620 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2636 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2638 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2634 2647
2635 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2636} 2649}
2637 2650
2638sub size_allocate { 2651sub size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2652 my ($self, $w, $h) = @_;
2640 2653
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2644} 2655}
2645 2656
2646sub visibility_change { 2657sub visibility_change {
2647 my ($self, $visible) = @_; 2658 my ($self, $visible) = @_;
2648 2659
… …
2858 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2870 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2861 2872
2862 $self->show; 2873 $self->show;
2863 $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);
2864} 2875}
2865 2876
2866sub mouse_motion { 2877sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2868 2879
… …
3012 Scalar::Util::weaken ($self->{root} = $self); 3023 Scalar::Util::weaken ($self->{root} = $self);
3013 3024
3014 $self 3025 $self
3015} 3026}
3016 3027
3017sub configure {
3018 my ($self, $x, $y, $w, $h) = @_;
3019
3020 $self->{w} = $w;
3021 $self->{h} = $h;
3022}
3023
3024sub reconfigure {
3025 my ($self) = @_;
3026
3027 $self->SUPER::reconfigure;
3028
3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3030 if $self->{w};
3031}
3032
3033sub size_request { 3028sub size_request {
3034 my ($self) = @_; 3029 my ($self) = @_;
3035 3030
3036 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3037} 3032}
… …
3049 3044
3050 int $coord + 0.5 3045 int $coord + 0.5
3051} 3046}
3052 3047
3053sub size_allocate { 3048sub size_allocate {
3054 my ($self, $w, $h, $changed) = @_; 3049 my ($self, $w, $h) = @_;
3055 3050
3056 for my $child ($self->children) { 3051 for my $child ($self->children) {
3057 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)};
3058 3053
3059 $X = $child->{force_x} if exists $child->{force_x}; 3054 $X = $child->{force_x} if exists $child->{force_x};
… …
3133 3128
3134 while () { 3129 while () {
3135 if ($self->{realloc}) { 3130 if ($self->{realloc}) {
3136 #TODO use array-of-depth approach 3131 #TODO use array-of-depth approach
3137 3132
3133 use sort 'stable';
3134
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3139 @queue, values %{delete $self->{realloc}}; 3136 @queue, values %{delete $self->{realloc}};
3140 } 3137 }
3141 3138
3142 my $widget = pop @queue || last; 3139 my $widget = pop @queue || last;
3143 3140
3144 $widget->{visible} or last; # do not resize invisible widgets 3141 $widget->{visible} or last; # do not resize invisible widgets
3145 3142
3143 my ($w, $h) = $widget->size_request;
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
3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h} 3148 $w = $widget->{force_w} if exists $widget->{force_w};
3147 ? @$widget{qw(force_w force_h)} 3149 $h = $widget->{force_h} if exists $widget->{force_h};
3148 : $widget->size_request;
3149 3150
3150 my $min_size = $widget->{is_toplevel} ? 16 : 0; 3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3151 3152 || delete $widget->{force_realloc}) {
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3155 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
3156 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
3157 3155
3158 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3156 $self->{size_alloc}{$widget+0} = $widget;
3159 3157
3160 push @queue, $widget->{parent}
3161 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 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3162 } 3167 }
3163 } 3168 }
3164 3169
3165 while (my $size_alloc = delete $self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3167 values %$size_alloc; 3172 values %$size_alloc;
3168 3173
3169 while () { 3174 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last }; 3175 my $widget = pop @queue || last;
3171 3176
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174 3178
3175 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3176 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3177 3181
3178 $w = int $w + 0.5; 3182 $w = int $w + 0.5;
3179 $h = int $h + 0.5; 3183 $h = int $h + 0.5;
3180 3184
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3182
3183 $widget->{w} = $w; 3186 $widget->{w} = $w;
3184 $widget->{h} = $h; 3187 $widget->{h} = $h;
3185 3188
3186 $widget->emit (size_allocate => $w, $h, $changed); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3187 } 3191 }
3188 } 3192 }
3189 3193
3190 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3191 $_->() 3195 $_->()
3192 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3193 } 3197 }
3198
3194 3199
3195 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3198 3203

Diff Legend

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