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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.221 by root, Mon May 22 03:48:50 2006 UTC

… …
31 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 32 $TOOLTIP->show;
33 33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35 35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
39 38
40 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size; 40 $TOOLTIP->check_size;
42 $TOOLTIP->update; 41 $TOOLTIP->update;
43 } 42 }
… …
137 $rem += $_ - $i; 136 $rem += $_ - $i;
138 $_ = $i; 137 $_ = $i;
139 } 138 }
140} 139}
141 140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
142# call when resolution changes etc. 149# call when resolution changes etc.
143sub rescale_widgets { 150sub rescale_widgets {
144 my ($sx, $sy) = @_; 151 my ($sx, $sy) = @_;
145 152
153 # make a copy, otherwise for complains about freed values.
146 for my $widget (values %WIDGET) { 154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
147 if ($widget->{toplevel}) { 157 if ($widget->{toplevel}) {
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
… …
197} 207}
198 208
199sub show { 209sub show {
200 my ($self) = @_; 210 my ($self) = @_;
201 211
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
202 return if $self->{parent}; 218 return if $self->{parent};
203 219
204 $CFClient::UI::ROOT->add ($self); 220 $CFClient::UI::ROOT->add ($self);
205} 221}
206 222
207sub hide { 223sub hide {
208 my ($self) = @_; 224 my ($self) = @_;
225
226 for (my @w = $self; @w; ) {
227 my $w = pop @w;
228 push @w, $w->children;
229 $w->{visible} = 1;
230 }
209 231
210 undef $GRAB if $GRAB == $self; 232 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 233 undef $HOVER if $HOVER == $self;
212 234
213 $self->{parent}->remove ($self) 235 $self->{parent}->remove ($self)
… …
281sub set_max_size { 303sub set_max_size {
282 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
283 305
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
285 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
308}
309
310sub set_tooltip {
311 my ($self, $tooltip) = @_;
312
313 $self->{tooltip} = $tooltip;
314
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
286} 319}
287 320
288# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
289sub coord2local { 322sub coord2local {
290 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
376 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
377 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
378 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
379 glEnd; 412 glEnd;
380 glPopMatrix; 413 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 } 415 }
383} 416}
384 417
385sub _draw { 418sub _draw {
386 my ($self) = @_; 419 my ($self) = @_;
… …
406 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
407 440
408 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size 442 $self->check_size
410 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
411} 446}
412 447
413sub check_size { 448sub check_size {
414 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
415 450
… …
456 my $class = shift; 491 my $class = shift;
457 492
458 # range [value, low, high, page] 493 # range [value, low, high, page]
459 494
460 $class->SUPER::new ( 495 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
463 @_ 498 @_
464 ) 499 )
465} 500}
466 501
467sub _draw { 502sub _draw {
468 my ($self) = @_; 503 my ($self) = @_;
469 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
471 511
472 glEnable GL_BLEND; 512 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
475 515
476 glBegin GL_QUADS; 516 glBegin GL_QUADS;
477 glVertex 0 , 0; 517 glVertex 0 , 0;
478 glVertex 0 , $h; 518 glVertex 0 , $h;
479 glVertex $w, $h; 519 glVertex $w, $h;
480 glVertex $w, 0; 520 glVertex $w, 0;
481 glEnd; 521 glEnd;
482 522
483 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
484} 525}
485 526
486############################################################################# 527#############################################################################
487 528
488package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
675 716
676 $self->_render; 717 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 718 };
685} 719}
686 720
687sub _draw { 721sub _draw {
688 my ($self) = @_; 722 my ($self) = @_;
… …
692 my $tex = $self->{texture} 726 my $tex = $self->{texture}
693 or return; 727 or return;
694 728
695 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
698 732
699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700 734
701 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
702} 736}
… …
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
786 }, 820 },
787 ; 821 ;
788 822
789 $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 824 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 825 slider => $slider,
792 @_, 826 @_,
793 ); 827 );
794 828
795 $self->{vp}->add ($self->{scrolled}); 829 $self->{vp}->add ($self->{scrolled});
… …
896 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
897 931
898 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
900 934
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902 if $self->{title}; 936 if $self->{title};
903 937
904 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
905} 939}
906 940
… …
1267 1301
1268############################################################################# 1302#############################################################################
1269 1303
1270package CFClient::UI::Label; 1304package CFClient::UI::Label;
1271 1305
1272our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1273 1307
1274use CFClient::OpenGL; 1308use CFClient::OpenGL;
1275 1309
1276sub new { 1310sub new {
1277 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1278 1312
1279 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1281 #font => default_font 1317 #font => default_font
1282 #text => initial text 1318 #text => initial text
1283 #markup => initial narkup 1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1322 layout => (new CFClient::Layout),
1285 fontsize => 1, 1323 fontsize => 1,
1286 align => -1, 1324 align => -1,
1287 valign => -1, 1325 valign => -1,
1288 padding => 2, 1326 padding => 2,
… …
1303 } 1341 }
1304 1342
1305 $self 1343 $self
1306} 1344}
1307 1345
1308sub escape { 1346sub escape($) {
1309 local $_ = $_[1]; 1347 local $_ = $_[0];
1310 1348
1311 s/&/&amp;/g; 1349 s/&/&amp;/g;
1312 s/>/&gt;/g; 1350 s/>/&gt;/g;
1313 s/</&lt;/g; 1351 s/</&lt;/g;
1314 1352
1315 $_[1] 1353 $_
1316} 1354}
1317 1355
1318sub update { 1356sub update {
1319 my ($self) = @_; 1357 my ($self) = @_;
1320 1358
… …
1353sub size_request { 1391sub size_request {
1354 my ($self) = @_; 1392 my ($self) = @_;
1355 1393
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 1395 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1399
1360 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1361 1401
1362 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1392} 1432}
1393 1433
1394sub _draw { 1434sub _draw {
1395 my ($self) = @_; 1435 my ($self) = @_;
1396 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1397 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1440 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $self->{layout}->set_width ($self->{w}); 1442 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1446
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404 1448
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1451 : ($self->{w} - $tex->{w}) * 0.5);
1408 1452
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1455 : ($self->{h} - $tex->{h}) * 0.5);
1412 1456
1413 $tex 1457 $tex
1414 }; 1458 };
1415 1459
1416 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
… …
1471sub set_text { 1515sub set_text {
1472 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1473 1517
1474 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1519 $self->_set_text ($text);
1520 $self->update;
1476 $self->check_size; 1521 $self->check_size;
1477 $self->update;
1478} 1522}
1479 1523
1480sub get_text { 1524sub get_text {
1481 $_[0]{text} 1525 $_[0]{text}
1482} 1526}
… …
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1523 } 1567 }
1524 1568
1525 $self->_set_text ($text); 1569 $self->_set_text ($text);
1526 $self->update; 1570 $self->update;
1571 $self->check_size;
1527} 1572}
1528 1573
1529sub focus_in { 1574sub focus_in {
1530 my ($self) = @_; 1575 my ($self) = @_;
1531 1576
… …
1660 my $class = shift; 1705 my $class = shift;
1661 1706
1662 $class->SUPER::new ( 1707 $class->SUPER::new (
1663 padding => 4, 1708 padding => 4,
1664 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1667 can_hover => 1, 1711 can_hover => 1,
1668 align => 0, 1712 align => 0,
1669 valign => 0, 1713 valign => 0,
1670 can_events => 1, 1714 can_events => 1,
… …
1718 1762
1719 $class->SUPER::new ( 1763 $class->SUPER::new (
1720 padding => 2, 1764 padding => 2,
1721 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1766 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1769 state => 0,
1724 can_hover => 1, 1770 can_hover => 1,
1725 @_ 1771 @_
1726 ) 1772 )
1727} 1773}
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
2012 2058
2013sub new { 2059sub new {
2014 my $class = shift; 2060 my $class = shift;
2015 2061
2016 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
2017 2063
2018 # TODO: 0-width page 2064 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2066 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
2025 req_w => $::WIDTH / 80, 2073 req_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2074 req_h => $::WIDTH / 80,
2027 vertical => 0, 2075 vertical => 0,
2028 can_hover => 1, 2076 can_hover => 1,
2029 inner_pad => 5, 2077 inner_pad => 0.02,
2030 @_ 2078 @_
2031 ); 2079 );
2032 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
2033 $self 2084 $self
2085}
2086
2087sub set_value {
2088 my ($self, $value) = @_;
2089
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091
2092 $hi = $lo + 1 if $hi <= $lo;
2093
2094 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi;
2096
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103
2104 if ($value != $old_value) {
2105 $self->emit (changed => $value);
2106 $self->update;
2107 }
2034} 2108}
2035 2109
2036sub size_request { 2110sub size_request {
2037 my ($self) = @_; 2111 my ($self) = @_;
2038 2112
… …
2051 2125
2052sub mouse_motion { 2126sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
2054 2128
2055 if ($GRAB == $self) { 2129 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131
2132 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2135
2136 $self->set_value ($x * ($hi - $lo) + $lo);
2137 }
2138}
2139
2140sub update {
2141 my ($self) = @_;
2142
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]);
2145
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
2057 2147
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
2059 2149
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2062 2151
2063 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2154
2069 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2070 $self->update; 2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value;
2161 $self->{knob_w} = $page;
2071 } 2162 });
2072}
2073 2163
2074# the inner_* stuff is for generating a padding for the slider handle, 2164 $self->SUPER::update;
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080} 2165}
2081 2166
2082sub _draw { 2167sub _draw {
2083 my ($self) = @_; 2168 my ($self) = @_;
2084 2169
2085 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
2086 2171
2087 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
2088 2173
2089 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
2091 2176
2177 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2179 }
2097 2180
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2183
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2186
2122 # draw background 2187 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2189
2125 # draw handle 2190 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2192
2128 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
2129} 2194}
2130 2195
2131############################################################################# 2196#############################################################################
… …
2164 2229
2165 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2231 $self->reflow;
2167} 2232}
2168 2233
2234sub size_allocate {
2235 my ($self, $w, $h) = @_;
2236
2237 $self->SUPER::size_allocate ($w, $h);
2238
2239 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $self->{layout}->set_width ($self->{children}[0]{w});
2242
2243 $self->reflow;
2244}
2245
2169sub text_height { 2246sub text_height {
2170 my ($self, $text) = @_; 2247 my ($self, $text, $indent) = @_;
2171 2248
2172 my $layout = $self->{layout}; 2249 my $layout = $self->{layout};
2173 2250
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w}); 2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2176 $layout->set_markup ($text); 2253 $layout->set_markup ($text);
2177 2254
2178 ($layout->size)[1] 2255 ($layout->size)[1]
2179} 2256}
2180 2257
… …
2183 2260
2184 $self->{need_reflow}++; 2261 $self->{need_reflow}++;
2185 $self->update; 2262 $self->update;
2186} 2263}
2187 2264
2188sub size_allocate {
2189 my ($self, $w, $h) = @_;
2190
2191 $self->SUPER::size_allocate ($w, $h);
2192
2193 $self->{layout}->set_font ($self->{font}) if $self->{font};
2194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2195 $self->{layout}->set_width ($self->{children}[0]{w});
2196
2197 $self->reflow;
2198}
2199
2200sub add_paragraph { 2265sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2202 2267
2203 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2204 2269
2270 for my $line (split /\n/, $text) {
2205 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2206
2207 $self->{height} += $height; 2272 $self->{height} += $height;
2208
2209 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2210 2275
2211 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2212 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2213} 2278}
2214 2279
… …
2223 2288
2224 $ROOT->on_post_alloc ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2225 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2291 my $height = 0;
2227 2292
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2229 for @{$self->{par}}; 2294 for @{$self->{par}};
2230 2295
2231 $self->{height} = $height; 2296 $self->{height} = $height;
2232 2297
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2299 $self->{children}[1]->update;
2234 2300
2235 delete $self->{texture}; 2301 delete $self->{texture};
2236 } 2302 }
2237 2303
2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2239 glClearColor 0, 0, 0, 0; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2241
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244 2307
2245 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2246 2309
2247 my $y0 = $top; 2310 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2251 2314
2252 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2253 2316
2254 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2255 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2256 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2323 my $h = $par->[0];
2258 2324
2259 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2261 $layout->set_markup ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2262 2329
2263 my ($W, $H) = $layout->size; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2331
2332 glRasterPos $par->[2], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2334 }
2266 2335
2267 $y += $h; 2336 $y += $h;
2268 } 2337 }
2269 2338
2270 glDisable GL_TEXTURE_2D; 2339 glDisable GL_BLEND;
2271 }; 2340 };
2272 }); 2341 });
2273} 2342}
2274 2343
2275sub _draw { 2344sub _draw {
2276 my ($self) = @_; 2345 my ($self) = @_;
2277 2346
2278 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2349 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2283 2352
2284 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2285 2354
2286} 2355}
… …
2385 2454
2386sub set_tooltip_from { 2455sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2456 my ($self, $widget) = @_;
2388 2457
2389 $self->add (new CFClient::UI::Label 2458 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2459 markup => $widget->{tooltip},
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2461 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2465 );
2396} 2466}
2397 2467
2398sub size_request { 2468sub size_request {
2399 my ($self) = @_; 2469 my ($self) = @_;
… …
2445use CFClient::OpenGL; 2515use CFClient::OpenGL;
2446 2516
2447sub new { 2517sub new {
2448 my $class = shift; 2518 my $class = shift;
2449 2519
2450 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2451 aspect => 1, 2521 aspect => 1,
2452 @_, 2522 @_,
2453 ) 2523 );
2524
2525 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self);
2527
2528 $self->{timer} = Event->timer (
2529 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2530 hard => 1,
2531 interval => $self->{animspeed},
2532 cb => sub {
2533 ++$widget->{frame};
2534 $widget->update;
2535 },
2536 );
2537 }
2538
2539 $self
2454} 2540}
2455 2541
2456sub size_request { 2542sub size_request {
2457 (32, 8) 2543 (32, 8)
2458} 2544}
2459 2545
2460sub _draw { 2546sub _draw {
2461 my ($self) = @_; 2547 my ($self) = @_;
2462 2548
2463 return unless $::CONN;#d# manage and cache textures differently 2549 return unless $::CONN;#d# manage and cache textures differently
2550
2551 my $face;
2552
2553 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}];
2555
2556 $face = $anim->[ $self->{frame} % @$anim ]
2557 if $anim && @$anim;
2558 }
2559
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2560 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2561
2466 # TODO animation
2467 if ($tex) { 2562 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2563 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2565 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2567 glDisable GL_TEXTURE_2D;
2473 } 2568 }
2474} 2569}
2475 2570
2571sub DESTROY {
2572 my ($self) = @_;
2573
2574 $self->{timer}->cancel
2575 if $self->{timer};
2576
2577 $self->SUPER::DESTROY;
2578}
2579
2476############################################################################# 2580#############################################################################
2477 2581
2478package CFClient::UI::InventoryItem; 2582package CFClient::UI::InventoryItem;
2479 2583
2480our @ISA = CFClient::UI::HBox::; 2584our @ISA = CFClient::UI::HBox::;
2585
2586sub _item_to_desc {
2587 my ($item) = @_;
2588
2589 my $desc =
2590 $item->{nrof} < 2
2591 ? $item->{name}
2592 : "$item->{nrof} × $item->{name_pl}";
2593
2594 $item->{flags} & Crossfire::Protocol::F_OPEN
2595 and $desc .= " (open)";
2596 $item->{flags} & Crossfire::Protocol::F_APPLIED
2597 and $desc .= " (applied)";
2598 $item->{flags} & Crossfire::Protocol::F_UNPAID
2599 and $desc .= " (unpaid)";
2600 $item->{flags} & Crossfire::Protocol::F_MAGIC
2601 and $desc .= " (magic)";
2602 $item->{flags} & Crossfire::Protocol::F_CURSED
2603 and $desc .= " (cursed)";
2604 $item->{flags} & Crossfire::Protocol::F_DAMNED
2605 and $desc .= " (damned)";
2606 $item->{flags} & Crossfire::Protocol::F_LOCKED
2607 and $desc .= " *";
2608
2609 $desc
2610}
2481 2611
2482sub new { 2612sub new {
2483 my $class = shift; 2613 my $class = shift;
2484 2614
2485 my %args = @_; 2615 my %args = @_;
2486 2616
2487 my $item = delete $args{item}; 2617 my $item = delete $args{item};
2488 2618
2489 my $desc = $item->{nrof} < 2 2619 my $desc = _item_to_desc ($item);
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493 2620
2494 my $self = $class->SUPER::new ( 2621 my $self = $class->SUPER::new (
2495 can_hover => 1, 2622 can_hover => 1,
2496 can_events => 1, 2623 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc) 2624 tooltip => ((CFClient::UI::Label::escape $desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2625 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub { 2626 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_; 2627 my ($self, $ev, $x, $y) = @_;
2501 2628
2502 # todo: maybe put examine on 1? but should just be a tooltip :( 2629 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) { 2630 if ($ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag};
2632
2633 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT;
2635 }
2636
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2637 $::CONN->send ("move $targ $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) { 2638 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}"); 2639 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) { 2640 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new ( 2641 my @menu_items = (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2643 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2644 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645 (
2646 $item->{flags} & Crossfire::Protocol::F_LOCKED
2647 ? (
2648 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649 )
2650 : (
2651 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2652 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653 )
2518 ], 2654 ),
2519 )->popup ($ev); 2655 );
2656
2657 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2520 } 2658 }
2521 2659
2522 1 2660 1
2523 }, 2661 },
2524 %args 2662 %args
2525 ); 2663 );
2664
2526 2665
2527 $self->add (new CFClient::UI::Face 2666 $self->add (new CFClient::UI::Face
2528 can_events => 0, 2667 can_events => 0,
2529 face => $item->{face}, 2668 face => $item->{face},
2530 anim => $item->{anim}, 2669 anim => $item->{anim},
2531 animspeed => $item->{animspeed}, 2670 animspeed => $item->{animspeed},
2532 ); 2671 );
2533 2672
2534 $self->add (new CFClient::UI::Label 2673 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2535 can_events => 0, 2674
2536 text => $desc, 2675 $self->{item} = $item;
2537 ); 2676
2677 $self->update_item;
2538 2678
2539 $self 2679 $self
2680}
2681
2682sub update_item {
2683 my ($self) = @_;
2684
2685 my $desc = _item_to_desc ($self->{item});
2686
2687 $self->{name_lbl}->set_text ($desc);
2540} 2688}
2541 2689
2542############################################################################# 2690#############################################################################
2543 2691
2544package CFClient::UI::Inventory; 2692package CFClient::UI::Inventory;
… …
2568 } @$items; 2716 } @$items;
2569 2717
2570 $self->{real_items} = \@items; 2718 $self->{real_items} = \@items;
2571 2719
2572 for my $item (@items) { 2720 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item ();
2578 } 2723 }
2579 2724
2580 $self->{scrolled}->add (@items); 2725 $self->{scrolled}->add (@items);
2581 2726
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
… …
2663 2808
2664package CFClient::UI::Statusbox; 2809package CFClient::UI::Statusbox;
2665 2810
2666our @ISA = CFClient::UI::VBox::; 2811our @ISA = CFClient::UI::VBox::;
2667 2812
2813sub new {
2814 my $class = shift;
2815
2816 $class->SUPER::new (
2817 fontsize => 0.8,
2818 @_,
2819 )
2820}
2821
2668sub reorder { 2822sub reorder {
2669 my ($self) = @_; 2823 my ($self) = @_;
2670 my $NOW = time; 2824 my $NOW = time;
2671 2825
2672 while (my ($k, $v) = each %{ $self->{item} }) { 2826 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 2844 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 2845 : $item->{text};
2692 2846
2693 for ($short) { 2847 for ($short) {
2694 s/^\s+//; 2848 s/^\s+//;
2695 s/\012.*/…/s; 2849 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 2850 }
2699 2851
2700 new CFClient::UI::Label 2852 new CFClient::UI::Label
2701 markup => $short, 2853 markup => $short,
2702 tooltip => $item->{tooltip}, 2854 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 2855 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 2856 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 2857 fontsize => $item->{fontsize} || $self->{fontsize},
2858 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 2859 fg => $item->{fg},
2707 can_events => 1, 2860 can_events => 1,
2708 can_hover => 1 2861 can_hover => 1
2709 }; 2862 };
2710 } 2863 }
2711 2864
… …
2737 $self->{item}{$group} = { 2890 $self->{item}{$group} = {
2738 id => ++$self->{id}, 2891 id => ++$self->{id},
2739 text => $text, 2892 text => $text,
2740 timeout => $timeout, 2893 timeout => $timeout,
2741 tooltip => $text, 2894 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 2895 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 2896 pri => 0,
2745 count => 1, 2897 count => 1,
2746 %arg, 2898 %arg,
2747 }; 2899 };
2748 } 2900 }
2749 2901
2750 $self->reorder; 2902 $self->reorder;
2751} 2903}
2752 2904
2905sub reconfigure {
2906 my ($self) = @_;
2907
2908 delete $_->{label}
2909 for values %{ $self->{item} || {} };
2910
2911 $self->reorder;
2912 $self->SUPER::reconfigure;
2913}
2914
2753############################################################################# 2915#############################################################################
2754 2916
2755package CFClient::UI::Root; 2917package CFClient::UI::Root;
2756 2918
2757our @ISA = CFClient::UI::Container::; 2919our @ISA = CFClient::UI::Container::;
… …
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797 2959
2798 for my $child ($self->children) { 2960 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2961 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 2962
2963 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2964 if exists $child->{req_x};
2965
2966 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2967 if exists $child->{req_y};
2968
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2969 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2970 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971
2803 $child->configure ($X, $Y, $W, $H); 2972 $child->configure ($X, $Y, $W, $H);
2804 } 2973 }
2805} 2974}
2806 2975
2807sub coord2local { 2976sub coord2local {
… …
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3081 glClear GL_COLOR_BUFFER_BIT;
2913 3082
2914 glMatrixMode GL_PROJECTION; 3083 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3084 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3085 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3086 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3087 glLoadIdentity;
2919 3088
2920 $self->_draw; 3089 $self->_draw;
2921} 3090}
… …
2923############################################################################# 3092#############################################################################
2924 3093
2925package CFClient::UI; 3094package CFClient::UI;
2926 3095
2927$ROOT = new CFClient::UI::Root; 3096$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3097$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3098
29301 30991
2931 3100

Diff Legend

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