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.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC

… …
136 $rem += $_ - $i; 136 $rem += $_ - $i;
137 $_ = $i; 137 $_ = $i;
138 } 138 }
139} 139}
140 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
141# call when resolution changes etc. 149# call when resolution changes etc.
142sub rescale_widgets { 150sub rescale_widgets {
143 my ($sx, $sy) = @_; 151 my ($sx, $sy) = @_;
144 152
153 # make a copy, otherwise for complains about freed values.
145 for my $widget (values %WIDGET) { 154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
146 if ($widget->{toplevel}) { 157 if ($widget->{toplevel}) {
147 $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};
148 $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};
149 $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};
150 $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};
… …
195 %$self = (); 206 %$self = ();
196} 207}
197 208
198sub show { 209sub show {
199 my ($self) = @_; 210 my ($self) = @_;
200
201 return if $self->{parent}; 211 return if $self->{parent};
202 212
203 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
204} 227}
205 228
206sub hide { 229sub hide {
207 my ($self) = @_; 230 my ($self) = @_;
208 231
… …
280sub set_max_size { 303sub set_max_size {
281 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
282 305
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 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 }
285} 319}
286 320
287# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
288sub coord2local { 322sub coord2local {
289 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
375 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
378 glEnd; 412 glEnd;
379 glPopMatrix; 413 glPopMatrix;
380 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;
381 } 415 }
382} 416}
383 417
384sub _draw { 418sub _draw {
385 my ($self) = @_; 419 my ($self) = @_;
… …
405 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
406 440
407 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size 442 $self->check_size
409 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
410} 446}
411 447
412sub check_size { 448sub check_size {
413 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
414 450
… …
455 my $class = shift; 491 my $class = shift;
456 492
457 # range [value, low, high, page] 493 # range [value, low, high, page]
458 494
459 $class->SUPER::new ( 495 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
462 @_ 498 @_
463 ) 499 )
464} 500}
465 501
466sub _draw { 502sub _draw {
467 my ($self) = @_; 503 my ($self) = @_;
468 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
470 511
471 glEnable GL_BLEND; 512 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
474 515
475 glBegin GL_QUADS; 516 glBegin GL_QUADS;
476 glVertex 0 , 0; 517 glVertex 0 , 0;
477 glVertex 0 , $h; 518 glVertex 0 , $h;
478 glVertex $w, $h; 519 glVertex $w, $h;
479 glVertex $w, 0; 520 glVertex $w, 0;
480 glEnd; 521 glEnd;
481 522
482 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
483} 525}
484 526
485############################################################################# 527#############################################################################
486 528
487package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
671 $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 {
672 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
674 716
675 $self->_render; 717 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 718 };
684} 719}
685 720
686sub _draw { 721sub _draw {
687 my ($self) = @_; 722 my ($self) = @_;
… …
691 my $tex = $self->{texture} 726 my $tex = $self->{texture}
692 or return; 727 or return;
693 728
694 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
697 732
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 734
700 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
701} 736}
… …
708 743
709sub size_request { 744sub size_request {
710 my ($self) = @_; 745 my ($self) = @_;
711 746
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 748
715 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
716} 750}
717 751
718sub size_allocate { 752sub size_allocate {
719 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
720 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
721 $self->update; 758 $self->update;
722} 759}
723 760
724sub set_offset { 761sub set_offset {
725 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 }, 822 },
786 ; 823 ;
787 824
788 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 827 slider => $slider,
791 @_, 828 @_,
792 ); 829 );
793 830
794 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
895 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
896 933
897 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
899 936
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901 if $self->{title}; 938 if $self->{title};
902 939
903 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
904} 941}
905 942
… …
1266 1303
1267############################################################################# 1304#############################################################################
1268 1305
1269package CFClient::UI::Label; 1306package CFClient::UI::Label;
1270 1307
1271our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1272 1309
1273use CFClient::OpenGL; 1310use CFClient::OpenGL;
1274 1311
1275sub new { 1312sub new {
1276 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1277 1314
1278 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1280 #font => default_font 1319 #font => default_font
1281 #text => initial text 1320 #text => initial text
1282 #markup => initial narkup 1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1324 layout => (new CFClient::Layout),
1284 fontsize => 1, 1325 fontsize => 1,
1285 align => -1, 1326 align => -1,
1286 valign => -1, 1327 valign => -1,
1287 padding => 2, 1328 padding => 2,
… …
1302 } 1343 }
1303 1344
1304 $self 1345 $self
1305} 1346}
1306 1347
1307sub escape { 1348sub escape($) {
1308 local $_ = $_[1]; 1349 local $_ = $_[0];
1309 1350
1310 s/&/&amp;/g; 1351 s/&/&amp;/g;
1311 s/>/&gt;/g; 1352 s/>/&gt;/g;
1312 s/</&lt;/g; 1353 s/</&lt;/g;
1313 1354
1314 $_[1] 1355 $_
1315} 1356}
1316 1357
1317sub update { 1358sub update {
1318 my ($self) = @_; 1359 my ($self) = @_;
1319 1360
… …
1352sub size_request { 1393sub size_request {
1353 my ($self) = @_; 1394 my ($self) = @_;
1354 1395
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1401
1359 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1360 1403
1361 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1391} 1434}
1392 1435
1393sub _draw { 1436sub _draw {
1394 my ($self) = @_; 1437 my ($self) = @_;
1395 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1396 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1442 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1448
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1450
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5; 1453 : ($self->{w} - $tex->{w}) * 0.5);
1407 1454
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5; 1457 : ($self->{h} - $tex->{h}) * 0.5);
1411 1458
1412 $tex 1459 $tex
1413 }; 1460 };
1414 1461
1415 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
… …
1443 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1444 can_hover => 1, 1491 can_hover => 1,
1445 can_focus => 1, 1492 can_focus => 1,
1446 valign => 0, 1493 valign => 0,
1447 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1448 @_ 1496 @_
1449 ) 1497 )
1450} 1498}
1451 1499
1452sub _set_text { 1500sub _set_text {
… …
1470sub set_text { 1518sub set_text {
1471 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1472 1520
1473 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1522 $self->_set_text ($text);
1523 $self->update;
1475 $self->check_size; 1524 $self->check_size;
1476 $self->update;
1477} 1525}
1478 1526
1479sub get_text { 1527sub get_text {
1480 $_[0]{text} 1528 $_[0]{text}
1481} 1529}
… …
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1570 }
1523 1571
1524 $self->_set_text ($text); 1572 $self->_set_text ($text);
1525 $self->update; 1573 $self->update;
1574 $self->check_size;
1526} 1575}
1527 1576
1528sub focus_in { 1577sub focus_in {
1529 my ($self) = @_; 1578 my ($self) = @_;
1530 1579
… …
1659 my $class = shift; 1708 my $class = shift;
1660 1709
1661 $class->SUPER::new ( 1710 $class->SUPER::new (
1662 padding => 4, 1711 padding => 4,
1663 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1666 can_hover => 1, 1714 can_hover => 1,
1667 align => 0, 1715 align => 0,
1668 valign => 0, 1716 valign => 0,
1669 can_events => 1, 1717 can_events => 1,
… …
1717 1765
1718 $class->SUPER::new ( 1766 $class->SUPER::new (
1719 padding => 2, 1767 padding => 2,
1720 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0], 1769 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5],
1722 state => 0, 1772 state => 0,
1723 can_hover => 1, 1773 can_hover => 1,
1724 @_ 1774 @_
1725 ) 1775 )
1726} 1776}
… …
2010 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
2011 2061
2012sub new { 2062sub new {
2013 my $class = shift; 2063 my $class = shift;
2014 2064
2015 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
2016 2066
2017 # TODO: 0-width page 2067 # TODO: 0-width page
2018 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2069 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
2024 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2026 vertical => 0, 2078 vertical => 0,
2027 can_hover => 1, 2079 can_hover => 1,
2028 inner_pad => 5, 2080 inner_pad => 0.02,
2029 @_ 2081 @_
2030 ); 2082 );
2031 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
2032 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2098sub set_value {
2099 my ($self, $value) = @_;
2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102
2103 $hi = $lo + 1 if $hi <= $lo;
2104
2105 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi;
2107
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
2033} 2119}
2034 2120
2035sub size_request { 2121sub size_request {
2036 my ($self) = @_; 2122 my ($self) = @_;
2037 2123
… …
2050 2136
2051sub mouse_motion { 2137sub mouse_motion {
2052 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
2053 2139
2054 if ($GRAB == $self) { 2140 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142
2143 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2146
2147 $self->set_value ($x * ($hi - $lo) + $lo);
2148 }
2149}
2150
2151sub update {
2152 my ($self) = @_;
2153
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]);
2156
2055 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2157 my ($value, $lo, $hi, $page) = @{$self->{range}};
2056 2158
2057 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2159 my $inner_w = 1 - 2 * $self->{inner_pad};
2058 2160
2059 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2060 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2061 2162
2062 $x -= $inner_pad_px; # substract the padding 2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2063 $x = $x * ($hi - $lo) / $inner_w + $lo; 2164 $value = $self->{scale} * ($value - $lo);
2064 $x = $lo if $x < $lo;
2065 $x = $hi - $page if $x > $hi - $page;
2066 $self->{range}[0] = $x;
2067 2165
2068 $self->emit (changed => $x); 2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2069 $self->update; 2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value;
2172 $self->{knob_w} = $page;
2070 } 2173 });
2071}
2072 2174
2073# the inner_* stuff is for generating a padding for the slider handle, 2175 $self->SUPER::update;
2074# so that the handle doesn't leave the texture. This calculation isn't 100%
2075# correct propably, but it does the job for now
2076sub _calc_inner_pad_px {
2077 my ($self, $w) = @_;
2078 ($w / 100) * $self->{inner_pad} # % to pixels
2079} 2176}
2080 2177
2081sub _draw { 2178sub _draw {
2082 my ($self) = @_; 2179 my ($self) = @_;
2083 2180
2084 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
2085 2182
2086 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
2087 2184
2088 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2089 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2090 2187
2188 glTranslate 1, 0, 0;
2091 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2092 glTranslate 0, -$self->{w}, 0;
2093
2094 ($w, $h) = ($h, $w);
2095 } 2190 }
2096 2191
2097 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2098 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2099 2194
2100 my ($value, $lo, $hi, $page) = @{$self->{range}};
2101
2102 $hi = $value + 1 if $lo == $hi;
2103
2104 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2105 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2106
2107 $page = int $page * $inner_w / ($hi - $lo);
2108 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2109
2110 $w -= $page;
2111 $page &= ~1;
2112 glTranslate $page * 0.5, 0, 0;
2113 $page ||= 2;
2114
2115 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2116 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2117
2118 glEnable GL_TEXTURE_2D; 2195 glEnable GL_TEXTURE_2D;
2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120 2197
2121 # draw background 2198 # draw background
2122 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2123 2200
2124 # draw handle 2201 # draw handle
2125 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2126 2203
2127 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2128} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2129 2247
2130############################################################################# 2248#############################################################################
2131 2249
2132package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2133 2251
… …
2163 2281
2164 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2283 $self->reflow;
2166} 2284}
2167 2285
2286sub size_allocate {
2287 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290
2291 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294
2295 $self->reflow;
2296}
2297
2168sub text_height { 2298sub text_height {
2169 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2170 2300
2171 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2172 2302
2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2175 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2176 2306
2177 ($layout->size)[1] 2307 ($layout->size)[1]
2178} 2308}
2179 2309
… …
2182 2312
2183 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2184 $self->update; 2314 $self->update;
2185} 2315}
2186 2316
2187sub size_allocate {
2188 my ($self, $w, $h) = @_;
2189
2190 $self->SUPER::size_allocate ($w, $h);
2191
2192 $self->{layout}->set_font ($self->{font}) if $self->{font};
2193 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2194 $self->{layout}->set_width ($self->{children}[0]{w});
2195
2196 $self->reflow;
2197}
2198
2199sub add_paragraph { 2317sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2318 my ($self, $color, $text, $indent) = @_;
2201 2319
2202 #TODO: intelligently "reformat" paragraph 2320 #TODO: intelligently "reformat" paragraph
2203 2321
2322 for my $line (split /\n/, $text) {
2204 my $height = $self->text_height ($text); 2323 my $height = $self->text_height ($line);
2205
2206 $self->{height} += $height; 2324 $self->{height} += $height;
2207
2208 push @{$self->{par}}, [$height, $color, $text]; 2325 push @{$self->{par}}, [$height, $color, $indent, $line];
2326 }
2209 2327
2210 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2211 $self->{children}[1]->update; 2329 $self->{children}[1]->update;
2212} 2330}
2213 2331
… …
2222 2340
2223 $ROOT->on_post_alloc ($self, sub { 2341 $ROOT->on_post_alloc ($self, sub {
2224 if (delete $self->{need_reflow}) { 2342 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2343 my $height = 0;
2226 2344
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2228 for @{$self->{par}}; 2346 for @{$self->{par}};
2229 2347
2230 $self->{height} = $height; 2348 $self->{height} = $height;
2231 2349
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2351 $self->{children}[1]->update;
2233 2352
2234 delete $self->{texture}; 2353 delete $self->{texture};
2235 } 2354 }
2236 2355
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2238 glClearColor 0, 0, 0, 0; 2357 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2358 glClear GL_COLOR_BUFFER_BIT;
2240
2241 glEnable GL_TEXTURE_2D;
2242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2243 2359
2244 my $top = int $self->{children}[1]{range}[0]; 2360 my $top = int $self->{children}[1]{range}[0];
2245 2361
2246 my $y0 = $top; 2362 my $y0 = $top;
2247 my $y1 = $top + $self->{h}; 2363 my $y1 = $top + $self->{h};
… …
2250 2366
2251 my $layout = $self->{layout}; 2367 my $layout = $self->{layout};
2252 2368
2253 $layout->set_font ($self->{font}) if $self->{font}; 2369 $layout->set_font ($self->{font}) if $self->{font};
2254 2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2255 for my $par (@{$self->{par}}) { 2374 for my $par (@{$self->{par}}) {
2256 my $h = $par->[0]; 2375 my $h = $par->[0];
2257 2376
2258 if ($y0 < $y + $h && $y < $y1) { 2377 if ($y0 < $y + $h && $y < $y1) {
2259 $layout->set_foreground (@{ $par->[1] }); 2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2260 $layout->set_markup ($par->[2]); 2380 $layout->set_markup ($par->[3]);
2261 2381
2262 my ($W, $H) = $layout->size; 2382 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2383
2384 glRasterPos $par->[2], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2264 } 2386 }
2265 2387
2266 $y += $h; 2388 $y += $h;
2267 } 2389 }
2268 2390
2269 glDisable GL_TEXTURE_2D; 2391 glDisable GL_BLEND;
2270 }; 2392 };
2271 }); 2393 });
2272} 2394}
2273 2395
2274sub _draw { 2396sub _draw {
2275 my ($self) = @_; 2397 my ($self) = @_;
2276 2398
2277 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2279 glColor 1, 1, 1, 1; 2401 glColor 1, 1, 1, 1;
2280 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2402 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2281 glDisable GL_TEXTURE_2D; 2403 glDisable GL_TEXTURE_2D;
2282 2404
2283 $self->{children}[1]->draw; 2405 $self->{children}[1]->draw;
2284 2406
2285} 2407}
… …
2384 2506
2385sub set_tooltip_from { 2507sub set_tooltip_from {
2386 my ($self, $widget) = @_; 2508 my ($self, $widget) = @_;
2387 2509
2388 $self->add (new CFClient::UI::Label 2510 $self->add (new CFClient::UI::Label
2389 markup => $widget->{tooltip}, 2511 markup => $widget->{tooltip},
2390 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2391 fontsize => 0.8, 2513 fontsize => 0.8,
2392 fg => [0, 0, 0, 1], 2514 fg => [0, 0, 0, 1],
2515 ellipsise => 0,
2393 font => ($widget->{tooltip_font} || $::FONT_PROP), 2516 font => ($widget->{tooltip_font} || $::FONT_PROP),
2394 ); 2517 );
2395} 2518}
2396 2519
2397sub size_request { 2520sub size_request {
2398 my ($self) = @_; 2521 my ($self) = @_;
… …
2444use CFClient::OpenGL; 2567use CFClient::OpenGL;
2445 2568
2446sub new { 2569sub new {
2447 my $class = shift; 2570 my $class = shift;
2448 2571
2449 $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2450 aspect => 1, 2573 aspect => 1,
2451 @_, 2574 @_,
2452 ) 2575 );
2576
2577 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self);
2579
2580 $self->{timer} = Event->timer (
2581 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2582 hard => 1,
2583 interval => $self->{animspeed},
2584 cb => sub {
2585 ++$widget->{frame};
2586 $widget->update;
2587 },
2588 );
2589 }
2590
2591 $self
2453} 2592}
2454 2593
2455sub size_request { 2594sub size_request {
2456 (32, 8) 2595 (32, 8)
2457} 2596}
2458 2597
2598sub update {
2599 my ($self) = @_;
2600
2601 return unless $self->{visible};
2602
2603 $self->SUPER::update;
2604}
2605
2459sub _draw { 2606sub _draw {
2460 my ($self) = @_; 2607 my ($self) = @_;
2461 2608
2462 return unless $::CONN;#d# manage and cache textures differently 2609 return unless $::CONN;#d# manage and cache textures differently
2610
2611 my $face;
2612
2613 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}];
2615
2616 $face = $anim->[ $self->{frame} % @$anim ]
2617 if $anim && @$anim;
2618 }
2619
2463 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2464 2621
2465 # TODO animation
2466 if ($tex) { 2622 if ($tex) {
2467 glEnable GL_TEXTURE_2D; 2623 glEnable GL_TEXTURE_2D;
2468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2469 glColor 1, 1, 1, 1; 2625 glColor 1, 1, 1, 1;
2470 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2471 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2472 } 2628 }
2473} 2629}
2474 2630
2631sub DESTROY {
2632 my ($self) = @_;
2633
2634 $self->{timer}->cancel
2635 if $self->{timer};
2636
2637 $self->SUPER::DESTROY;
2638}
2639
2475############################################################################# 2640#############################################################################
2476 2641
2477package CFClient::UI::InventoryItem; 2642package CFClient::UI::InventoryItem;
2478 2643
2479our @ISA = CFClient::UI::HBox::; 2644our @ISA = CFClient::UI::HBox::;
2645
2646sub _item_to_desc {
2647 my ($item) = @_;
2648
2649 my $desc =
2650 $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} × $item->{name_pl}";
2653
2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2655 and $desc .= " (open)";
2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2657 and $desc .= " (applied)";
2658 $item->{flags} & Crossfire::Protocol::F_UNPAID
2659 and $desc .= " (unpaid)";
2660 $item->{flags} & Crossfire::Protocol::F_MAGIC
2661 and $desc .= " (magic)";
2662 $item->{flags} & Crossfire::Protocol::F_CURSED
2663 and $desc .= " (cursed)";
2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2665 and $desc .= " (damned)";
2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2667 and $desc .= " *";
2668
2669 $desc
2670}
2480 2671
2481sub new { 2672sub new {
2482 my $class = shift; 2673 my $class = shift;
2483 2674
2484 my %args = @_; 2675 my %args = @_;
2485 2676
2486 my $item = delete $args{item}; 2677 my $item = delete $args{item};
2487 2678
2488 my $desc = $item->{nrof} < 2 2679 my $desc = _item_to_desc ($item);
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492 2680
2493 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2494 can_hover => 1, 2682 can_hover => 1,
2495 can_events => 1, 2683 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc) 2684 tooltip => ((CFClient::UI::Label::escape $desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub { 2686 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_; 2687 my ($self, $ev, $x, $y) = @_;
2500 2688
2501 # todo: maybe put examine on 1? but should just be a tooltip :( 2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2691 my $targ = $::CONN->{player}{tag};
2692
2693 if ($item->{container} == $::CONN->{player}{tag}) {
2694 $targ = $main::OPENCONT;
2695 }
2696
2697 $::CONN->send ("move $targ $item->{tag} 0");
2502 if ($ev->{button} == 1) { 2698 } elsif ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2699 $::CONN->send ("examine $item->{tag}");
2504 } elsif ($ev->{button} == 2) { 2700 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}"); 2701 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) { 2702 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new ( 2703 my @menu_items = (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2706 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2707 (
2708 $item->{flags} & Crossfire::Protocol::F_LOCKED
2709 ? (
2710 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2711 )
2712 : (
2713 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2517 ], 2716 ),
2518 )->popup ($ev); 2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519 } 2720 }
2520 2721
2521 1 2722 1
2522 }, 2723 },
2523 %args 2724 %args
2524 ); 2725 );
2726
2525 2727
2526 $self->add (new CFClient::UI::Face 2728 $self->add (new CFClient::UI::Face
2527 can_events => 0, 2729 can_events => 0,
2528 face => $item->{face}, 2730 face => $item->{face},
2529 anim => $item->{anim}, 2731 anim => $item->{anim},
2530 animspeed => $item->{animspeed}, 2732 animspeed => $item->{animspeed},
2531 ); 2733 );
2532 2734
2533 $self->add (new CFClient::UI::Label 2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2534 can_events => 0, 2736
2535 text => $desc, 2737 $self->{item} = $item;
2536 ); 2738
2739 $self->update_item;
2537 2740
2538 $self 2741 $self
2742}
2743
2744sub update_item {
2745 my ($self) = @_;
2746
2747 my $desc = _item_to_desc ($self->{item});
2748
2749 $self->{name_lbl}->set_text ($desc);
2539} 2750}
2540 2751
2541############################################################################# 2752#############################################################################
2542 2753
2543package CFClient::UI::Inventory; 2754package CFClient::UI::Inventory;
… …
2546 2757
2547sub new { 2758sub new {
2548 my $class = shift; 2759 my $class = shift;
2549 2760
2550 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2551 scrolled => (new CFClient::UI::VBox), 2762 scrolled => (new CFClient::UI::Table),
2552 @_, 2763 @_,
2553 ); 2764 );
2554 2765
2555 $self 2766 $self
2556} 2767}
… …
2567 } @$items; 2778 } @$items;
2568 2779
2569 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2570 2781
2571 for my $item (@items) { 2782 for my $item (@items) {
2572 my $desc = $item->{nrof} < 2 2783 $item->{item} = $item;
2573 ? $item->{name}
2574 : "$item->{nrof} $item->{name_pl}";
2575
2576 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2577 } 2786 }
2578 2787
2788 my $i = 0;
2789 for (@items) {
2579 $self->{scrolled}->add (@items); 2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2793 }
2580 2794
2581# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2582} 2796}
2583 2797
2584sub size_request { 2798sub size_request {
… …
2662 2876
2663package CFClient::UI::Statusbox; 2877package CFClient::UI::Statusbox;
2664 2878
2665our @ISA = CFClient::UI::VBox::; 2879our @ISA = CFClient::UI::VBox::;
2666 2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2667sub reorder { 2890sub reorder {
2668 my ($self) = @_; 2891 my ($self) = @_;
2669 my $NOW = time; 2892 my $NOW = time;
2670 2893
2671 while (my ($k, $v) = each %{ $self->{item} }) { 2894 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2689 ? "<b>$item->{count} ×</b> $item->{text}" 2912 ? "<b>$item->{count} ×</b> $item->{text}"
2690 : $item->{text}; 2913 : $item->{text};
2691 2914
2692 for ($short) { 2915 for ($short) {
2693 s/^\s+//; 2916 s/^\s+//;
2694 s/\012.*/…/s; 2917 s/\s+/ /g;
2695 my $len = int 40 / $item->{fontsize};
2696 substr $_, $len, length, "…" if $len < length;
2697 } 2918 }
2698 2919
2699 new CFClient::UI::Label 2920 new CFClient::UI::Label
2700 markup => $short, 2921 markup => $short,
2701 tooltip => $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2702 tooltip_font => $::FONT_PROP, 2923 tooltip_font => $::FONT_PROP,
2703 tooltip_width => 0.67, 2924 tooltip_width => 0.67,
2704 fontsize => $item->{fontsize}, 2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2705 color => $item->{color}, 2927 fg => $item->{fg},
2706 can_events => 1, 2928 can_events => 1,
2707 can_hover => 1 2929 can_hover => 1
2708 }; 2930 };
2709 } 2931 }
2710 2932
… …
2736 $self->{item}{$group} = { 2958 $self->{item}{$group} = {
2737 id => ++$self->{id}, 2959 id => ++$self->{id},
2738 text => $text, 2960 text => $text,
2739 timeout => $timeout, 2961 timeout => $timeout,
2740 tooltip => $text, 2962 tooltip => $text,
2741 fontsize => 0.8,
2742 color => [0.8, 0.8, 0.8, 0.8], 2963 fg => [0.8, 0.8, 0.8, 0.8],
2743 pri => 0, 2964 pri => 0,
2744 count => 1, 2965 count => 1,
2745 %arg, 2966 %arg,
2746 }; 2967 };
2747 } 2968 }
2748 2969
2749 $self->reorder; 2970 $self->reorder;
2750} 2971}
2751 2972
2973sub reconfigure {
2974 my ($self) = @_;
2975
2976 delete $_->{label}
2977 for values %{ $self->{item} || {} };
2978
2979 $self->reorder;
2980 $self->SUPER::reconfigure;
2981}
2982
2752############################################################################# 2983#############################################################################
2753 2984
2754package CFClient::UI::Root; 2985package CFClient::UI::Root;
2755 2986
2756our @ISA = CFClient::UI::Container::; 2987our @ISA = CFClient::UI::Container::;
… …
2795 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 3026 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2796 3027
2797 for my $child ($self->children) { 3028 for my $child ($self->children) {
2798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2799 3030
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x};
3033
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
2800 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2801 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
2802 $child->configure ($X, $Y, $W, $H); 3040 $child->configure ($X, $Y, $W, $H);
2803 } 3041 }
2804} 3042}
2805 3043
2806sub coord2local { 3044sub coord2local {
… …
2832 $child->{x} = int $child->{x}; 3070 $child->{x} = int $child->{x};
2833 $child->{y} = int $child->{y}; 3071 $child->{y} = int $child->{y};
2834 } 3072 }
2835 3073
2836 $self->SUPER::add (@children); 3074 $self->SUPER::add (@children);
3075
3076 while (@children) {
3077 my $w = pop @children;
3078 push @children, $w->children;
3079 $w->{visible} = 1;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 }
2837} 3093}
2838 3094
2839sub on_refresh { 3095sub on_refresh {
2840 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2841 3097
… …
2910 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2911 glClear GL_COLOR_BUFFER_BIT; 3167 glClear GL_COLOR_BUFFER_BIT;
2912 3168
2913 glMatrixMode GL_PROJECTION; 3169 glMatrixMode GL_PROJECTION;
2914 glLoadIdentity; 3170 glLoadIdentity;
2915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2916 glMatrixMode GL_MODELVIEW; 3172 glMatrixMode GL_MODELVIEW;
2917 glLoadIdentity; 3173 glLoadIdentity;
2918 3174
2919 $self->_draw; 3175 $self->_draw;
2920} 3176}
… …
2922############################################################################# 3178#############################################################################
2923 3179
2924package CFClient::UI; 3180package CFClient::UI;
2925 3181
2926$ROOT = new CFClient::UI::Root; 3182$ROOT = new CFClient::UI::Root;
2927$TOOLTIP = new CFClient::UI::Tooltip; 3183$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2928 3184
29291 31851
2930 3186

Diff Legend

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