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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.230 by root, Wed May 24 21:59:54 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
149sub reconfigure_widgets {
150 # make a copy, otherwise C<for> complains about freed values.
151 my @widgets = values %WIDGET;
152
153 $_->reconfigure
154 for @widgets;
155}
156
141# call when resolution changes etc. 157# call when resolution changes etc.
142sub rescale_widgets { 158sub rescale_widgets {
143 my ($sx, $sy) = @_; 159 my ($sx, $sy) = @_;
144 160
145 for my $widget (values %WIDGET) { 161 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 162 if ($widget->{is_toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 163 $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}; 164 $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}; 165 $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}; 166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 } 171 }
156
157 $widget->reconfigure;
158 } 172 }
173
174 reconfigure_widgets;
159} 175}
160 176
161############################################################################# 177#############################################################################
162 178
163package CFClient::UI::Base; 179package CFClient::UI::Base;
… …
195 %$self = (); 211 %$self = ();
196} 212}
197 213
198sub show { 214sub show {
199 my ($self) = @_; 215 my ($self) = @_;
200
201 return if $self->{parent}; 216 return if $self->{parent};
202 217
203 $CFClient::UI::ROOT->add ($self); 218 $CFClient::UI::ROOT->add ($self);
219}
220
221sub show_centered {
222 my ($self) = @_;
223 return if $self->{parent};
224
225 $self->show;
226
227 $CFClient::UI::ROOT->on_post_alloc (
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
204} 232}
205 233
206sub hide { 234sub hide {
207 my ($self) = @_; 235 my ($self) = @_;
208 236
… …
280sub set_max_size { 308sub set_max_size {
281 my ($self, $w, $h) = @_; 309 my ($self, $w, $h) = @_;
282 310
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 311 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 312 delete $self->{max_h}; $self->{max_h} = $h if $h;
313}
314
315sub set_tooltip {
316 my ($self, $tooltip) = @_;
317
318 $self->{tooltip} = $tooltip;
319
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip;
323 }
285} 324}
286 325
287# translate global coordinates to local coordinate system 326# translate global coordinates to local coordinate system
288sub coord2local { 327sub coord2local {
289 my ($self, $x, $y) = @_; 328 my ($self, $x, $y) = @_;
… …
405 Scalar::Util::weaken ($self->{parent} = $parent); 444 Scalar::Util::weaken ($self->{parent} = $parent);
406 445
407 # TODO: req_w _does_change after ->reconfigure 446 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size 447 $self->check_size
409 unless exists $self->{req_w}; 448 unless exists $self->{req_w};
449
450 $self->show;
410} 451}
411 452
412sub check_size { 453sub check_size {
413 my ($self, $forced) = @_; 454 my ($self, $forced) = @_;
414 455
… …
455 my $class = shift; 496 my $class = shift;
456 497
457 # range [value, low, high, page] 498 # range [value, low, high, page]
458 499
459 $class->SUPER::new ( 500 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 501 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 502 #active_bg => [1, 1, 1, 0.5],
462 @_ 503 @_
463 ) 504 )
464} 505}
465 506
466sub _draw { 507sub _draw {
467 my ($self) = @_; 508 my ($self) = @_;
468 509
510 my $color = $FOCUS == $self && $self->{active_bg}
511 ? $self->{active_bg}
512 : $self->{bg};
513
514 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 515 my ($w, $h) = @$self{qw(w h)};
470 516
471 glEnable GL_BLEND; 517 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 519 glColor @$color;
474 520
475 glBegin GL_QUADS; 521 glBegin GL_QUADS;
476 glVertex 0 , 0; 522 glVertex 0 , 0;
477 glVertex 0 , $h; 523 glVertex 0 , $h;
478 glVertex $w, $h; 524 glVertex $w, $h;
479 glVertex $w, 0; 525 glVertex $w, 0;
480 glEnd; 526 glEnd;
481 527
482 glDisable GL_BLEND; 528 glDisable GL_BLEND;
529 }
483} 530}
484 531
485############################################################################# 532#############################################################################
486 533
487package CFClient::UI::Empty; 534package CFClient::UI::Empty;
… …
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 719 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 720 glClear GL_COLOR_BUFFER_BIT;
674 721
675 $self->_render; 722 $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 }; 723 };
684} 724}
685 725
686sub _draw { 726sub _draw {
687 my ($self) = @_; 727 my ($self) = @_;
… …
691 my $tex = $self->{texture} 731 my $tex = $self->{texture}
692 or return; 732 or return;
693 733
694 glEnable GL_TEXTURE_2D; 734 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 736 glColor 1, 1, 1, 1;
697 737
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 739
700 glDisable GL_TEXTURE_2D; 740 glDisable GL_TEXTURE_2D;
701} 741}
… …
708 748
709sub size_request { 749sub size_request {
710 my ($self) = @_; 750 my ($self) = @_;
711 751
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 752 @$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 753
715 @$self{qw(child_w child_h)} 754 @$self{qw(child_w child_h)}
716} 755}
717 756
718sub size_allocate { 757sub size_allocate {
719 my ($self, $w, $h) = @_; 758 my ($self, $w, $h) = @_;
720 759
760 my ($cw, $ch) = @$self{qw(child_w child_h)};
761# $w = $self->{w};
762 $self->child->configure (0, 0, $cw, $ch);
721 $self->update; 763 $self->update;
722} 764}
723 765
724sub set_offset { 766sub set_offset {
725 my ($self, $x, $y) = @_; 767 my ($self, $x, $y) = @_;
… …
779 821
780 my $slider = new CFClient::UI::Slider 822 my $slider = new CFClient::UI::Slider
781 vertical => 1, 823 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 824 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 825 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 826 $self->{vp}->set_offset (0, $_[1]);
785 }, 827 },
786 ; 828 ;
787 829
788 $self = $class->SUPER::new ( 830 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 831 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 832 slider => $slider,
791 @_, 833 @_,
792 ); 834 );
793 835
794 $self->{vp}->add ($self->{scrolled}); 836 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 837 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 838 $self->add ($self->{slider});
797 839
798 $self 840 $self
841}
842
843sub size_allocate {
844 my ($self, $w, $h) = @_;
845
846 $self->SUPER::size_allocate ($w, $h);
847
848 my $child = $self->{vp}->child;
849 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799} 850}
800 851
801#TODO# update range on size_allocate depending on child 852#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 853# update viewport offset on scroll
803 854
… …
857 my $class = shift; 908 my $class = shift;
858 909
859 # TODO: user_x, user_y, overwrite moveto? 910 # TODO: user_x, user_y, overwrite moveto?
860 911
861 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 913 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 914 border_bg => [1, 1, 1, 1],
864 border => 0.6, 915 border => 0.6,
865 toplevel => 1, 916 is_toplevel => 1,
866 can_events => 1, 917 can_events => 1,
867 @_ 918 @_
868 ); 919 );
869 920
870 $self->{title} &&= new CFClient::UI::Label 921 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 922 align => 0,
… …
895 my ($self, $w, $h) = @_; 946 my ($self, $w, $h) = @_;
896 947
897 $h -= List::Util::max 0, $self->border * 2; 948 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 949 $w -= List::Util::max 0, $self->border * 2;
899 950
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901 if $self->{title}; 952 if $self->{title};
902 953
903 $self->child->configure ($self->border, $self->border, $w, $h); 954 $self->child->configure ($self->border, $self->border, $w, $h);
904} 955}
905 956
… …
1266 1317
1267############################################################################# 1318#############################################################################
1268 1319
1269package CFClient::UI::Label; 1320package CFClient::UI::Label;
1270 1321
1271our @ISA = CFClient::UI::Base::; 1322our @ISA = CFClient::UI::DrawBG::;
1272 1323
1273use CFClient::OpenGL; 1324use CFClient::OpenGL;
1274 1325
1275sub new { 1326sub new {
1276 my ($class, %arg) = @_; 1327 my ($class, %arg) = @_;
1277 1328
1278 my $self = $class->SUPER::new ( 1329 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1330 fg => [1, 1, 1],
1331 #bg => none
1332 #active_bg => none
1280 #font => default_font 1333 #font => default_font
1281 #text => initial text 1334 #text => initial text
1282 #markup => initial narkup 1335 #markup => initial narkup
1336 #max_w => maximum pixel width
1337 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1338 layout => (new CFClient::Layout),
1284 fontsize => 1, 1339 fontsize => 1,
1285 align => -1, 1340 align => -1,
1286 valign => -1, 1341 valign => -1,
1287 padding => 2, 1342 padding => 2,
… …
1302 } 1357 }
1303 1358
1304 $self 1359 $self
1305} 1360}
1306 1361
1307sub escape { 1362sub escape($) {
1308 local $_ = $_[1]; 1363 local $_ = $_[0];
1309 1364
1310 s/&/&amp;/g; 1365 s/&/&amp;/g;
1311 s/>/&gt;/g; 1366 s/>/&gt;/g;
1312 s/</&lt;/g; 1367 s/</&lt;/g;
1313 1368
1314 $_[1] 1369 $_
1315} 1370}
1316 1371
1317sub update { 1372sub update {
1318 my ($self) = @_; 1373 my ($self) = @_;
1319 1374
… …
1352sub size_request { 1407sub size_request {
1353 my ($self) = @_; 1408 my ($self) = @_;
1354 1409
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1410 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1411 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1415
1359 my ($w, $h) = $self->{layout}->size; 1416 my ($w, $h) = $self->{layout}->size;
1360 1417
1361 if (exists $self->{template}) { 1418 if (exists $self->{template}) {
… …
1391} 1448}
1392 1449
1393sub _draw { 1450sub _draw {
1394 my ($self) = @_; 1451 my ($self) = @_;
1395 1452
1453 $self->SUPER::_draw; # draw background, if applicable
1454
1396 my $tex = $self->{texture} ||= do { 1455 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1456 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1457 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1458 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1462
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1463 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1464
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5; 1467 : ($self->{w} - $tex->{w}) * 0.5);
1407 1468
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5; 1471 : ($self->{h} - $tex->{h}) * 0.5);
1411 1472
1412 $tex 1473 $tex
1413 }; 1474 };
1414 1475
1415 glEnable GL_TEXTURE_2D; 1476 glEnable GL_TEXTURE_2D;
… …
1443 active_fg => [0, 0, 0], 1504 active_fg => [0, 0, 0],
1444 can_hover => 1, 1505 can_hover => 1,
1445 can_focus => 1, 1506 can_focus => 1,
1446 valign => 0, 1507 valign => 0,
1447 can_events => 1, 1508 can_events => 1,
1509 #text => ...
1448 @_ 1510 @_
1449 ) 1511 )
1450} 1512}
1451 1513
1452sub _set_text { 1514sub _set_text {
… …
1470sub set_text { 1532sub set_text {
1471 my ($self, $text) = @_; 1533 my ($self, $text) = @_;
1472 1534
1473 $self->{cursor} = length $text; 1535 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1536 $self->_set_text ($text);
1537 $self->update;
1475 $self->check_size; 1538 $self->check_size;
1476 $self->update;
1477} 1539}
1478 1540
1479sub get_text { 1541sub get_text {
1480 $_[0]{text} 1542 $_[0]{text}
1481} 1543}
… …
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1583 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1584 }
1523 1585
1524 $self->_set_text ($text); 1586 $self->_set_text ($text);
1525 $self->update; 1587 $self->update;
1588 $self->check_size;
1526} 1589}
1527 1590
1528sub focus_in { 1591sub focus_in {
1529 my ($self) = @_; 1592 my ($self) = @_;
1530 1593
… …
1659 my $class = shift; 1722 my $class = shift;
1660 1723
1661 $class->SUPER::new ( 1724 $class->SUPER::new (
1662 padding => 4, 1725 padding => 4,
1663 fg => [1, 1, 1], 1726 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1727 active_fg => [0, 0, 1],
1666 can_hover => 1, 1728 can_hover => 1,
1667 align => 0, 1729 align => 0,
1668 valign => 0, 1730 valign => 0,
1669 can_events => 1, 1731 can_events => 1,
… …
1717 1779
1718 $class->SUPER::new ( 1780 $class->SUPER::new (
1719 padding => 2, 1781 padding => 2,
1720 fg => [1, 1, 1], 1782 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0], 1783 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5],
1722 state => 0, 1786 state => 0,
1723 can_hover => 1, 1787 can_hover => 1,
1724 @_ 1788 @_
1725 ) 1789 )
1726} 1790}
… …
2018 # TODO: req_w/h are wrong with vertical 2082 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2083 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2084 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2086 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2089 range => [0, 0, 100, 10, 0],
2024 req_w => $::WIDTH / 80, 2090 req_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2091 req_h => $::WIDTH / 80,
2026 vertical => 0, 2092 vertical => 0,
2027 can_hover => 1, 2093 can_hover => 1,
2028 inner_pad => .05, 2094 inner_pad => 0.02,
2029 @_ 2095 @_
2030 ); 2096 );
2031 2097
2032 $self->set_value ($self->{range}[0]); 2098 $self->set_value ($self->{range}[0]);
2033 $self->update; 2099 $self->update;
2034 2100
2035 $self 2101 $self
2036} 2102}
2037 2103
2104sub set_range {
2105 my ($self, $range) = @_;
2106
2107 $self->{range} = $range;
2108
2109 $self->update;
2110}
2111
2038sub set_value { 2112sub set_value {
2039 my ($self, $value) = @_; 2113 my ($self, $value) = @_;
2040 2114
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2115 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042 2116
2043 $hi = $lo + 1 if $hi <= $lo; 2117 $hi = $lo + 1 if $hi <= $lo;
2044 2118
2119 $page = $hi - $lo if $page > $hi - $lo;
2120
2045 $value = $lo if $value < $lo; 2121 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi; 2122 $value = $hi - $page if $value > $hi - $page;
2047 2123
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2124 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit; 2125 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052 2126
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054 2128
2055 if ($value != $old_value) { 2129 if ($value != $old_value) {
2056 $self->emit (changed => $value); 2130 $self->emit (changed => $value);
… …
2069 2143
2070sub button_down { 2144sub button_down {
2071 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
2072 2146
2073 $self->SUPER::button_down ($ev, $x, $y); 2147 $self->SUPER::button_down ($ev, $x, $y);
2148
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150
2074 $self->mouse_motion ($ev, $x, $y); 2151 $self->mouse_motion ($ev, $x, $y);
2075} 2152}
2076 2153
2077sub mouse_motion { 2154sub mouse_motion {
2078 my ($self, $ev, $x, $y) = @_; 2155 my ($self, $ev, $x, $y) = @_;
… …
2080 if ($GRAB == $self) { 2157 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082 2159
2083 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2160 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084 2161
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086 2163
2087 $self->set_value ($x * ($hi - $lo) + $lo); 2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2088 } 2165 }
2089} 2166}
2090 2167
2091sub update { 2168sub update {
2092 my ($self) = @_; 2169 my ($self) = @_;
2093 2170
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095 $self->set_value ($self->{range}[0]); 2172 $self->set_value ($self->{range}[0]);
2096 2173
2097 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2174 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100;
2098 2176
2099 my $inner_w = 1 - 2 * $self->{inner_pad}; 2177 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100 2178
2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2179 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2180 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102 2181
2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2182 $value = ($value - $lo) / $range;
2104 $value = $self->{scale} * ($value - $lo); 2183 $value = $value * $self->{scale} + $self->{offset};
2105 2184
2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value; 2185 $self->{knob_x} = $value - $knob_w * 0.5;
2112 $self->{knob_w} = $page; 2186 $self->{knob_w} = $knob_w;
2113 }); 2187 });
2114 2188
2115 $self->SUPER::update; 2189 $self->SUPER::update;
2116} 2190}
2117 2191
… …
2123 glScale $self->{w}, $self->{h}; 2197 glScale $self->{w}, $self->{h};
2124 2198
2125 if ($self->{vertical}) { 2199 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2200 # draw a vertical slider like a rotated horizontal slider
2127 2201
2202 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2203 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2204 }
2131 2205
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2206 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2207 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2208
… …
2141 # draw handle 2215 # draw handle
2142 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2216 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2143 2217
2144 glDisable GL_TEXTURE_2D; 2218 glDisable GL_TEXTURE_2D;
2145} 2219}
2220
2221#############################################################################
2222
2223package CFClient::UI::ValSlider;
2224
2225our @ISA = CFClient::UI::HBox::;
2226
2227sub new {
2228 my ($class, %arg) = @_;
2229
2230 my $range = delete $arg{range};
2231
2232 my $self = $class->SUPER::new (
2233 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2234 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2235 to_value => sub { shift },
2236 from_value => sub { shift },
2237 %arg,
2238 );
2239
2240 $self->{slider}->connect (changed => sub {
2241 my ($self, $value) = @_;
2242 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2243 $self->{parent}->emit (changed => $value);
2244 });
2245
2246# $self->{entry}->connect (changed => sub {
2247# my ($self, $value) = @_;
2248# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2249# $self->{parent}->emit (changed => $value);
2250# });
2251
2252 $self->add ($self->{slider}, $self->{entry});
2253
2254 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2255
2256 $self
2257}
2258
2259sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) }
2146 2261
2147############################################################################# 2262#############################################################################
2148 2263
2149package CFClient::UI::TextView; 2264package CFClient::UI::TextView;
2150 2265
… …
2180 2295
2181 $self->{fontsize} = $fontsize; 2296 $self->{fontsize} = $fontsize;
2182 $self->reflow; 2297 $self->reflow;
2183} 2298}
2184 2299
2185sub text_height {
2186 my ($self, $text) = @_;
2187
2188 my $layout = $self->{layout};
2189
2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191 $layout->set_width ($self->{children}[0]{w});
2192 $layout->set_markup ($text);
2193
2194 ($layout->size)[1]
2195}
2196
2197sub reflow {
2198 my ($self) = @_;
2199
2200 $self->{need_reflow}++;
2201 $self->update;
2202}
2203
2204sub size_allocate { 2300sub size_allocate {
2205 my ($self, $w, $h) = @_; 2301 my ($self, $w, $h) = @_;
2206 2302
2207 $self->SUPER::size_allocate ($w, $h); 2303 $self->SUPER::size_allocate ($w, $h);
2208 2304
… …
2211 $self->{layout}->set_width ($self->{children}[0]{w}); 2307 $self->{layout}->set_width ($self->{children}[0]{w});
2212 2308
2213 $self->reflow; 2309 $self->reflow;
2214} 2310}
2215 2311
2312sub text_size {
2313 my ($self, $text, $indent) = @_;
2314
2315 my $layout = $self->{layout};
2316
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent);
2319 $layout->set_markup ($text);
2320
2321 $layout->size
2322}
2323
2324sub reflow {
2325 my ($self) = @_;
2326
2327 $self->{need_reflow}++;
2328 $self->update;
2329}
2330
2331sub set_offset {
2332 my ($self, $offset) = @_;
2333
2334 # todo: base offset on lines or so, not on pixels
2335 $self->{children}[1]->set_value ($offset);
2336}
2337
2338sub clear {
2339 my ($self) = @_;
2340
2341 $self->{par} = [];
2342 $self->{height} = 0;
2343 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2344}
2345
2216sub add_paragraph { 2346sub add_paragraph {
2217 my ($self, $color, $text) = @_; 2347 my ($self, $color, $text, $indent) = @_;
2218 2348
2219 #TODO: intelligently "reformat" paragraph 2349 for my $line (split /\n/, $text) {
2220 2350 my ($w, $h) = $self->text_size ($line);
2221 my $height = $self->text_height ($text);
2222
2223 $self->{height} += $height; 2351 $self->{height} += $h;
2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2353 }
2224 2354
2225 push @{$self->{par}}, [$height, $color, $text];
2226
2227 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2355 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2228 $self->{children}[1]->update;
2229} 2356}
2230 2357
2231sub update { 2358sub update {
2232 my ($self) = @_; 2359 my ($self) = @_;
2233 2360
… …
2236 return unless $self->{h} > 0; 2363 return unless $self->{h} > 0;
2237 2364
2238 delete $self->{texture}; 2365 delete $self->{texture};
2239 2366
2240 $ROOT->on_post_alloc ($self, sub { 2367 $ROOT->on_post_alloc ($self, sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369
2241 if (delete $self->{need_reflow}) { 2370 if (delete $self->{need_reflow}) {
2242 my $height = 0; 2371 my $height = 0;
2243 2372
2244 $height += $_->[0] = $self->text_height ($_->[2]) 2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2245 for @{$self->{par}}; 2377 for (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2379 $layout->set_width ($W - $_->[3]);
2380 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3];
2383 $_->[1] = $h;
2384 }
2385
2386 $height += $_->[1];
2387 }
2246 2388
2247 $self->{height} = $height; 2389 $self->{height} = $height;
2248 2390
2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2250 2392
2251 delete $self->{texture}; 2393 delete $self->{texture};
2252 } 2394 }
2253 2395
2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2255 glClearColor 0, 0, 0, 0; 2397 glClearColor 0.5, 0.5, 0.5, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 2398 glClear GL_COLOR_BUFFER_BIT;
2257 2399
2258 glEnable GL_TEXTURE_2D;
2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260
2261 my $top = int $self->{children}[1]{range}[0]; 2400 my $top = int $self->{children}[1]{range}[0];
2262 2401
2263 my $y0 = $top; 2402 my $y0 = $top;
2264 my $y1 = $top + $self->{h}; 2403 my $y1 = $top + $H;
2265 2404
2266 my $y = 0; 2405 my $y = 0;
2267 2406
2268 my $layout = $self->{layout}; 2407 my $layout = $self->{layout};
2269 2408
2270 $layout->set_font ($self->{font}) if $self->{font}; 2409 $layout->set_font ($self->{font}) if $self->{font};
2271 2410
2411 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off
2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2414
2272 for my $par (@{$self->{par}}) { 2415 for my $par (@{$self->{par}}) {
2273 my $h = $par->[0]; 2416 my $h = $par->[1];
2274 2417
2275 if ($y0 < $y + $h && $y < $y1) { 2418 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] }); 2419 $layout->set_foreground (@{ $par->[2] });
2420 $layout->set_width ($W - $par->[3]);
2277 $layout->set_markup ($par->[2]); 2421 $layout->set_markup ($par->[4]);
2278 2422
2279 my ($W, $H) = $layout->size; 2423 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2424
2425 glRasterPos $par->[3], $y - $y0;
2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2281 } 2427 }
2282 2428
2283 $y += $h; 2429 $y += $h;
2284 } 2430 }
2285 2431
2286 glDisable GL_TEXTURE_2D; 2432 glDisable GL_BLEND;
2287 }; 2433 };
2288 }); 2434 });
2289} 2435}
2290 2436
2291sub _draw { 2437sub _draw {
2292 my ($self) = @_; 2438 my ($self) = @_;
2293 2439
2294 glEnable GL_TEXTURE_2D; 2440 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2442 glColor 1, 1, 1, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2299 2445
2300 $self->{children}[1]->draw; 2446 $self->{children}[1]->draw;
2301 2447
2302} 2448}
… …
2401 2547
2402sub set_tooltip_from { 2548sub set_tooltip_from {
2403 my ($self, $widget) = @_; 2549 my ($self, $widget) = @_;
2404 2550
2405 $self->add (new CFClient::UI::Label 2551 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip}, 2552 markup => $widget->{tooltip},
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 2554 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 2555 fg => [0, 0, 0, 1],
2556 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 2557 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 2558 );
2412} 2559}
2413 2560
2414sub size_request { 2561sub size_request {
2415 my ($self) = @_; 2562 my ($self) = @_;
… …
2461use CFClient::OpenGL; 2608use CFClient::OpenGL;
2462 2609
2463sub new { 2610sub new {
2464 my $class = shift; 2611 my $class = shift;
2465 2612
2466 $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2467 aspect => 1, 2614 aspect => 1,
2468 @_, 2615 @_,
2469 ) 2616 );
2617
2618 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self);
2620
2621 $self->{timer} = Event->timer (
2622 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2623 hard => 1,
2624 interval => $self->{animspeed},
2625 cb => sub {
2626 ++$widget->{frame};
2627 $widget->update;
2628 },
2629 );
2630 }
2631
2632 $self
2470} 2633}
2471 2634
2472sub size_request { 2635sub size_request {
2473 (32, 8) 2636 (32, 8)
2474} 2637}
2475 2638
2639sub update {
2640 my ($self) = @_;
2641
2642 return unless $self->{visible};
2643
2644 $self->SUPER::update;
2645}
2646
2476sub _draw { 2647sub _draw {
2477 my ($self) = @_; 2648 my ($self) = @_;
2478 2649
2479 return unless $::CONN;#d# manage and cache textures differently 2650 return unless $::CONN;
2651
2652 my $face;
2653
2654 if ($self->{frame}) {
2655 my $anim = $::CONN->{anim}[$self->{anim}];
2656
2657 $face = $anim->[ $self->{frame} % @$anim ]
2658 if $anim && @$anim;
2659 }
2660
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481 2662
2482 # TODO animation
2483 if ($tex) { 2663 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 2664 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 2666 glColor 1, 1, 1, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 2668 glDisable GL_TEXTURE_2D;
2489 } 2669 }
2490} 2670}
2491 2671
2672sub DESTROY {
2673 my ($self) = @_;
2674
2675 $self->{timer}->cancel
2676 if $self->{timer};
2677
2678 $self->SUPER::DESTROY;
2679}
2680
2492############################################################################# 2681#############################################################################
2493 2682
2494package CFClient::UI::InventoryItem; 2683package CFClient::UI::InventoryItem;
2495 2684
2496our @ISA = CFClient::UI::HBox::; 2685our @ISA = CFClient::UI::HBox::;
2497 2686
2498sub new { 2687sub _item_to_desc {
2499 my $class = shift; 2688 my ($item) = @_;
2500 2689
2501 my %args = @_; 2690 my $desc =
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2 2691 $item->{nrof} < 2
2506 ? $item->{name} 2692 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}"; 2693 : "$item->{nrof} × $item->{name_pl}";
2508 2694
2509 $item->{flags} & Crossfire::Protocol::F_OPEN 2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)"; 2696 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED 2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)"; 2698 and $desc .= " (applied)";
… …
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED 2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)"; 2706 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED 2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *"; 2708 and $desc .= " *";
2523 2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2524 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2525 can_hover => 1, 2723 can_hover => 1,
2526 can_events => 1, 2724 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc) 2725 tooltip => ((CFClient::UI::Label::escape $desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub { 2727 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2531 2729
2532 # todo: maybe put examine on 1? but should just be a tooltip :( 2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2533 if ($ev->{button} == 1) { 2739 } elsif ($ev->{button} == 1) {
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2740 $::CONN->send ("examine $item->{tag}");
2535 } elsif ($ev->{button} == 2) { 2741 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}"); 2742 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) { 2743 } elsif ($ev->{button} == 3) {
2538 my @menu_items = ( 2744 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [ 2756 )
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ], 2757 ),
2547 ); 2758 );
2548 2759
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 } 2761 }
2551 2762
2552 1 2763 1
2553 }, 2764 },
2554 %args 2765 %args
2555 ); 2766 );
2767
2556 2768
2557 $self->add (new CFClient::UI::Face 2769 $self->add (new CFClient::UI::Face
2558 can_events => 0, 2770 can_events => 0,
2559 face => $item->{face}, 2771 face => $item->{face},
2560 anim => $item->{anim}, 2772 anim => $item->{anim},
2561 animspeed => $item->{animspeed}, 2773 animspeed => $item->{animspeed},
2562 ); 2774 );
2563 2775
2564 $self->add (new CFClient::UI::Label 2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2565 can_events => 0, 2777
2566 text => $desc, 2778 $self->{item} = $item;
2567 ); 2779
2780 $self->update_item;
2568 2781
2569 $self 2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2570} 2791}
2571 2792
2572############################################################################# 2793#############################################################################
2573 2794
2574package CFClient::UI::Inventory; 2795package CFClient::UI::Inventory;
… …
2577 2798
2578sub new { 2799sub new {
2579 my $class = shift; 2800 my $class = shift;
2580 2801
2581 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2582 scrolled => (new CFClient::UI::VBox), 2803 scrolled => (new CFClient::UI::Table),
2583 @_, 2804 @_,
2584 ); 2805 );
2585 2806
2586 $self 2807 $self
2587} 2808}
… …
2598 } @$items; 2819 } @$items;
2599 2820
2600 $self->{real_items} = \@items; 2821 $self->{real_items} = \@items;
2601 2822
2602 for my $item (@items) { 2823 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2 2824 $item->{item} = $item;
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2608 } 2827 }
2609 2828
2829 my $i = 0;
2830 for (@items) {
2610 $self->{scrolled}->add (@items); 2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2611 2835
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613} 2837}
2614 2838
2615sub size_request { 2839sub size_request {
… …
2693 2917
2694package CFClient::UI::Statusbox; 2918package CFClient::UI::Statusbox;
2695 2919
2696our @ISA = CFClient::UI::VBox::; 2920our @ISA = CFClient::UI::VBox::;
2697 2921
2922sub new {
2923 my $class = shift;
2924
2925 $class->SUPER::new (
2926 fontsize => 0.8,
2927 @_,
2928 )
2929}
2930
2698sub reorder { 2931sub reorder {
2699 my ($self) = @_; 2932 my ($self) = @_;
2700 my $NOW = time; 2933 my $NOW = time;
2701 2934
2702 while (my ($k, $v) = each %{ $self->{item} }) { 2935 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2721 : $item->{text}; 2954 : $item->{text};
2722 2955
2723 for ($short) { 2956 for ($short) {
2724 s/^\s+//; 2957 s/^\s+//;
2725 s/\s+/ /g; 2958 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 } 2959 }
2729 2960
2730 new CFClient::UI::Label 2961 new CFClient::UI::Label
2731 markup => $short, 2962 markup => $short,
2732 tooltip => $item->{tooltip}, 2963 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP, 2964 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67, 2965 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize}, 2966 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44,
2736 fg => $item->{fg}, 2968 fg => $item->{fg},
2737 can_events => 1, 2969 can_events => 1,
2738 can_hover => 1 2970 can_hover => 1
2739 }; 2971 };
2740 } 2972 }
… …
2767 $self->{item}{$group} = { 2999 $self->{item}{$group} = {
2768 id => ++$self->{id}, 3000 id => ++$self->{id},
2769 text => $text, 3001 text => $text,
2770 timeout => $timeout, 3002 timeout => $timeout,
2771 tooltip => $text, 3003 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8], 3004 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0, 3005 pri => 0,
2775 count => 1, 3006 count => 1,
2776 %arg, 3007 %arg,
2777 }; 3008 };
2778 } 3009 }
2779 3010
2780 $self->reorder; 3011 $self->reorder;
2781} 3012}
2782 3013
3014sub reconfigure {
3015 my ($self) = @_;
3016
3017 delete $_->{label}
3018 for values %{ $self->{item} || {} };
3019
3020 $self->reorder;
3021 $self->SUPER::reconfigure;
3022}
3023
2783############################################################################# 3024#############################################################################
2784 3025
2785package CFClient::UI::Root; 3026package CFClient::UI::Root;
2786 3027
2787our @ISA = CFClient::UI::Container::; 3028our @ISA = CFClient::UI::Container::;
… …
2817} 3058}
2818 3059
2819sub size_allocate { 3060sub size_allocate {
2820 my ($self, $w, $h) = @_; 3061 my ($self, $w, $h) = @_;
2821 3062
2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827
2828 for my $child ($self->children) { 3063 for my $child ($self->children) {
2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2830 3065
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832 if exists $child->{req_x}; 3067 if exists $child->{req_x};
… …
2861} 3096}
2862 3097
2863sub add { 3098sub add {
2864 my ($self, @children) = @_; 3099 my ($self, @children) = @_;
2865 3100
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
2866 for my $child (@children) { 3107 for my $child (@children) {
2867 $child->{toplevel} = 1; 3108 $child->{is_toplevel} = 1;
2868 3109
2869 # integerise window positions 3110 # integerise window positions
2870 $child->{x} = int $child->{x}; 3111 $child->{x} = int $child->{x};
2871 $child->{y} = int $child->{y}; 3112 $child->{y} = int $child->{y};
2872 } 3113 }
2873 3114
2874 $self->SUPER::add (@children); 3115 $self->SUPER::add (@children);
3116}
3117
3118sub remove {
3119 my ($self, @children) = @_;
3120
3121 $self->SUPER::remove (@children);
3122
3123 while (@children) {
3124 my $w = pop @children;
3125 push @children, $w->children;
3126 delete $w->{visible};
3127 }
2875} 3128}
2876 3129
2877sub on_refresh { 3130sub on_refresh {
2878 my ($self, $id, $cb) = @_; 3131 my ($self, $id, $cb) = @_;
2879 3132
… …
2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2950 3203
2951 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2952 glLoadIdentity; 3205 glLoadIdentity;
2953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2955 glLoadIdentity; 3208 glLoadIdentity;
2956 3209
2957 $self->_draw; 3210 $self->_draw;
2958} 3211}
… …
2960############################################################################# 3213#############################################################################
2961 3214
2962package CFClient::UI; 3215package CFClient::UI;
2963 3216
2964$ROOT = new CFClient::UI::Root; 3217$ROOT = new CFClient::UI::Root;
2965$TOOLTIP = new CFClient::UI::Tooltip; 3218$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2966 3219
29671 32201
2968 3221

Diff Legend

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