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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.228 by root, Wed May 24 03:52:54 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};
… …
196 %$self = (); 206 %$self = ();
197} 207}
198 208
199sub show { 209sub show {
200 my ($self) = @_; 210 my ($self) = @_;
201
202 return if $self->{parent}; 211 return if $self->{parent};
203 212
204 $self->{toplevel} = 1;
205 $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 );
206} 227}
207 228
208sub hide { 229sub hide {
209 my ($self) = @_; 230 my ($self) = @_;
210 231
… …
282sub set_max_size { 303sub set_max_size {
283 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
284 305
285 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
286 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 }
287} 319}
288 320
289# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
290sub coord2local { 322sub coord2local {
291 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
377 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
378 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
379 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
380 glEnd; 412 glEnd;
381 glPopMatrix; 413 glPopMatrix;
382 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;
383 } 415 }
384} 416}
385 417
386sub _draw { 418sub _draw {
387 my ($self) = @_; 419 my ($self) = @_;
… …
407 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
408 440
409 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
410 $self->check_size 442 $self->check_size
411 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
412} 446}
413 447
414sub check_size { 448sub check_size {
415 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
416 450
… …
457 my $class = shift; 491 my $class = shift;
458 492
459 # range [value, low, high, page] 493 # range [value, low, high, page]
460 494
461 $class->SUPER::new ( 495 $class->SUPER::new (
462 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
463 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
464 @_ 498 @_
465 ) 499 )
466} 500}
467 501
468sub _draw { 502sub _draw {
469 my ($self) = @_; 503 my ($self) = @_;
470 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
471 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
472 511
473 glEnable GL_BLEND; 512 glEnable GL_BLEND;
474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
475 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
476 515
477 glBegin GL_QUADS; 516 glBegin GL_QUADS;
478 glVertex 0 , 0; 517 glVertex 0 , 0;
479 glVertex 0 , $h; 518 glVertex 0 , $h;
480 glVertex $w, $h; 519 glVertex $w, $h;
481 glVertex $w, 0; 520 glVertex $w, 0;
482 glEnd; 521 glEnd;
483 522
484 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
485} 525}
486 526
487############################################################################# 527#############################################################################
488 528
489package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
673 $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 {
674 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
675 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
676 716
677 $self->_render; 717 $self->_render;
678# glColorMask 1, 1, 1, 0;
679# glEnable GL_BLEND;
680# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
681# glRasterPos 0, 0;
682# glCopyPixels 0, 0, $self->{w}, $self->{h};
683# glDisable GL_BLEND;
684# glColorMask 1, 1, 1, 1;
685 }; 718 };
686} 719}
687 720
688sub _draw { 721sub _draw {
689 my ($self) = @_; 722 my ($self) = @_;
… …
693 my $tex = $self->{texture} 726 my $tex = $self->{texture}
694 or return; 727 or return;
695 728
696 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
698 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
699 732
700 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
701 734
702 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
703} 736}
… …
710 743
711sub size_request { 744sub size_request {
712 my ($self) = @_; 745 my ($self) = @_;
713 746
714 @$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)};
715 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
716 748
717 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
718} 750}
719 751
720sub size_allocate { 752sub size_allocate {
721 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
722 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
723 $self->update; 758 $self->update;
724} 759}
725 760
726sub set_offset { 761sub set_offset {
727 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
786 $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}));
787 }, 822 },
788 ; 823 ;
789 824
790 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
792 slider => $slider, 827 slider => $slider,
793 @_, 828 @_,
794 ); 829 );
795 830
796 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
897 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
898 933
899 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
900 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
901 936
902 $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)
903 if $self->{title}; 938 if $self->{title};
904 939
905 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
906} 941}
907 942
… …
1268 1303
1269############################################################################# 1304#############################################################################
1270 1305
1271package CFClient::UI::Label; 1306package CFClient::UI::Label;
1272 1307
1273our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1274 1309
1275use CFClient::OpenGL; 1310use CFClient::OpenGL;
1276 1311
1277sub new { 1312sub new {
1278 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1279 1314
1280 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1281 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1282 #font => default_font 1319 #font => default_font
1283 #text => initial text 1320 #text => initial text
1284 #markup => initial narkup 1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1285 layout => (new CFClient::Layout), 1324 layout => (new CFClient::Layout),
1286 fontsize => 1, 1325 fontsize => 1,
1287 align => -1, 1326 align => -1,
1288 valign => -1, 1327 valign => -1,
1289 padding => 2, 1328 padding => 2,
… …
1304 } 1343 }
1305 1344
1306 $self 1345 $self
1307} 1346}
1308 1347
1309sub escape { 1348sub escape($) {
1310 local $_ = $_[1]; 1349 local $_ = $_[0];
1311 1350
1312 s/&/&amp;/g; 1351 s/&/&amp;/g;
1313 s/>/&gt;/g; 1352 s/>/&gt;/g;
1314 s/</&lt;/g; 1353 s/</&lt;/g;
1315 1354
1316 $_[1] 1355 $_
1317} 1356}
1318 1357
1319sub update { 1358sub update {
1320 my ($self) = @_; 1359 my ($self) = @_;
1321 1360
… …
1354sub size_request { 1393sub size_request {
1355 my ($self) = @_; 1394 my ($self) = @_;
1356 1395
1357 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1358 $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});
1359 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1360 1401
1361 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1362 1403
1363 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1393} 1434}
1394 1435
1395sub _draw { 1436sub _draw {
1396 my ($self) = @_; 1437 my ($self) = @_;
1397 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1398 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1399 $self->{layout}->set_foreground (@{$self->{fg}}); 1442 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $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});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1403 1448
1404 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1405 1450
1406 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1407 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408 : ($self->{w} - $tex->{w}) * 0.5; 1453 : ($self->{w} - $tex->{w}) * 0.5);
1409 1454
1410 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1411 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412 : ($self->{h} - $tex->{h}) * 0.5; 1457 : ($self->{h} - $tex->{h}) * 0.5);
1413 1458
1414 $tex 1459 $tex
1415 }; 1460 };
1416 1461
1417 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
… …
1445 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1446 can_hover => 1, 1491 can_hover => 1,
1447 can_focus => 1, 1492 can_focus => 1,
1448 valign => 0, 1493 valign => 0,
1449 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1450 @_ 1496 @_
1451 ) 1497 )
1452} 1498}
1453 1499
1454sub _set_text { 1500sub _set_text {
… …
1472sub set_text { 1518sub set_text {
1473 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1474 1520
1475 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1476 $self->_set_text ($text); 1522 $self->_set_text ($text);
1523 $self->update;
1477 $self->check_size; 1524 $self->check_size;
1478 $self->update;
1479} 1525}
1480 1526
1481sub get_text { 1527sub get_text {
1482 $_[0]{text} 1528 $_[0]{text}
1483} 1529}
… …
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1570 }
1525 1571
1526 $self->_set_text ($text); 1572 $self->_set_text ($text);
1527 $self->update; 1573 $self->update;
1574 $self->check_size;
1528} 1575}
1529 1576
1530sub focus_in { 1577sub focus_in {
1531 my ($self) = @_; 1578 my ($self) = @_;
1532 1579
… …
1661 my $class = shift; 1708 my $class = shift;
1662 1709
1663 $class->SUPER::new ( 1710 $class->SUPER::new (
1664 padding => 4, 1711 padding => 4,
1665 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1668 can_hover => 1, 1714 can_hover => 1,
1669 align => 0, 1715 align => 0,
1670 valign => 0, 1716 valign => 0,
1671 can_events => 1, 1717 can_events => 1,
… …
1719 1765
1720 $class->SUPER::new ( 1766 $class->SUPER::new (
1721 padding => 2, 1767 padding => 2,
1722 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1723 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],
1724 state => 0, 1772 state => 0,
1725 can_hover => 1, 1773 can_hover => 1,
1726 @_ 1774 @_
1727 ) 1775 )
1728} 1776}
… …
2012 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
2013 2061
2014sub new { 2062sub new {
2015 my $class = shift; 2063 my $class = shift;
2016 2064
2017 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
2018 2066
2019 # TODO: 0-width page 2067 # TODO: 0-width page
2020 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
2021 # TODO: calculations are off 2069 # TODO: calculations are off
2022 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2023 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2024 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],
2025 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
2026 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2027 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2028 vertical => 0, 2078 vertical => 0,
2029 can_hover => 1, 2079 can_hover => 1,
2030 inner_pad => 5, 2080 inner_pad => 0.02,
2031 @_ 2081 @_
2032 ); 2082 );
2033 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
2034 $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 $page = $hi - $lo if $page > $hi - $lo;
2106
2107 $value = $lo if $value < $lo;
2108 $value = $hi - $page if $value > $hi - $page;
2109
2110 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2111 if $unit;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
2035} 2119}
2036 2120
2037sub size_request { 2121sub size_request {
2038 my ($self) = @_; 2122 my ($self) = @_;
2039 2123
… …
2045 2129
2046sub button_down { 2130sub button_down {
2047 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
2048 2132
2049 $self->SUPER::button_down ($ev, $x, $y); 2133 $self->SUPER::button_down ($ev, $x, $y);
2134
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136
2050 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
2051} 2138}
2052 2139
2053sub mouse_motion { 2140sub mouse_motion {
2054 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
2055 2142
2056 if ($GRAB == $self) { 2143 if ($GRAB == $self) {
2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2145
2146 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2151 }
2152}
2153
2154sub update {
2155 my ($self) = @_;
2156
2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2158 $self->set_value ($self->{range}[0]);
2159
2057 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
2058 2162
2059 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2060 2164
2061 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2165 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2062 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2166 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2063 2167
2064 $x -= $inner_pad_px; # substract the padding 2168 $value = ($value - $lo) / $range;
2065 $x = $x * ($hi - $lo) / $inner_w + $lo; 2169 $value = $value * $self->{scale} + $self->{offset};
2066 $x = $lo if $x < $lo;
2067 $x = $hi - $page if $x > $hi - $page;
2068 $self->{range}[0] = $x;
2069 2170
2070 $self->emit (changed => $x); 2171 $self->{knob_x} = $value - $knob_w * 0.5;
2071 $self->update; 2172 $self->{knob_w} = $knob_w;
2072 } 2173 });
2073}
2074 2174
2075# the inner_* stuff is for generating a padding for the slider handle, 2175 $self->SUPER::update;
2076# so that the handle doesn't leave the texture. This calculation isn't 100%
2077# correct propably, but it does the job for now
2078sub _calc_inner_pad_px {
2079 my ($self, $w) = @_;
2080 ($w / 100) * $self->{inner_pad} # % to pixels
2081} 2176}
2082 2177
2083sub _draw { 2178sub _draw {
2084 my ($self) = @_; 2179 my ($self) = @_;
2085 2180
2086 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
2087 2182
2088 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
2089 2184
2090 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2091 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2092 2187
2188 glTranslate 1, 0, 0;
2093 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2094 glTranslate 0, -$self->{w}, 0;
2095
2096 ($w, $h) = ($h, $w);
2097 } 2190 }
2098 2191
2099 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101 2194
2102 my ($value, $lo, $hi, $page) = @{$self->{range}};
2103
2104 $hi = $value + 1 if $lo == $hi;
2105
2106 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2107 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108
2109 $page = int $page * $inner_w / ($hi - $lo);
2110 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2111
2112 $w -= $page;
2113 $page &= ~1;
2114 glTranslate $page * 0.5, 0, 0;
2115 $page ||= 2;
2116
2117 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2118 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2119
2120 glEnable GL_TEXTURE_2D; 2195 glEnable GL_TEXTURE_2D;
2121 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122 2197
2123 # draw background 2198 # draw background
2124 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125 2200
2126 # draw handle 2201 # draw handle
2127 $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);
2128 2203
2129 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2130} 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 (@_) }
2131 2247
2132############################################################################# 2248#############################################################################
2133 2249
2134package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2135 2251
… …
2165 2281
2166 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2167 $self->reflow; 2283 $self->reflow;
2168} 2284}
2169 2285
2170sub text_height {
2171 my ($self, $text) = @_;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2176 $layout->set_width ($self->{children}[0]{w});
2177 $layout->set_markup ($text);
2178
2179 ($layout->size)[1]
2180}
2181
2182sub reflow {
2183 my ($self) = @_;
2184
2185 $self->{need_reflow}++;
2186 $self->update;
2187}
2188
2189sub size_allocate { 2286sub size_allocate {
2190 my ($self, $w, $h) = @_; 2287 my ($self, $w, $h) = @_;
2191 2288
2192 $self->SUPER::size_allocate ($w, $h); 2289 $self->SUPER::size_allocate ($w, $h);
2193 2290
… …
2196 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
2197 2294
2198 $self->reflow; 2295 $self->reflow;
2199} 2296}
2200 2297
2298sub text_size {
2299 my ($self, $text, $indent) = @_;
2300
2301 my $layout = $self->{layout};
2302
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text);
2306
2307 $layout->size
2308}
2309
2310sub reflow {
2311 my ($self) = @_;
2312
2313 $self->{need_reflow}++;
2314 $self->update;
2315}
2316
2317sub set_offset {
2318 my ($self, $offset) = @_;
2319
2320 # todo: base offset on lines or so, not on pixels
2321 $self->{children}[1]->set_value ($offset);
2322}
2323
2324sub clear {
2325 my ($self) = @_;
2326
2327 $self->{par} = [];
2328 $self->{height} = 0;
2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2330}
2331
2201sub add_paragraph { 2332sub add_paragraph {
2202 my ($self, $color, $text) = @_; 2333 my ($self, $color, $text, $indent) = @_;
2203 2334
2204 #TODO: intelligently "reformat" paragraph 2335 for my $line (split /\n/, $text) {
2205 2336 my ($w, $h) = $self->text_size ($line);
2206 my $height = $self->text_height ($text);
2207
2208 $self->{height} += $height; 2337 $self->{height} += $h;
2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2339 }
2209 2340
2210 push @{$self->{par}}, [$height, $color, $text];
2211
2212 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2213 $self->{children}[1]->update;
2214} 2342}
2215 2343
2216sub update { 2344sub update {
2217 my ($self) = @_; 2345 my ($self) = @_;
2218 2346
… …
2221 return unless $self->{h} > 0; 2349 return unless $self->{h} > 0;
2222 2350
2223 delete $self->{texture}; 2351 delete $self->{texture};
2224 2352
2225 $ROOT->on_post_alloc ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355
2226 if (delete $self->{need_reflow}) { 2356 if (delete $self->{need_reflow}) {
2227 my $height = 0; 2357 my $height = 0;
2228 2358
2229 $height += $_->[0] = $self->text_height ($_->[2]) 2359 my $layout = $self->{layout};
2360
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362
2230 for @{$self->{par}}; 2363 for (@{$self->{par}}) {
2364 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2365 $layout->set_width ($W - $_->[3]);
2366 $layout->set_markup ($_->[4]);
2367 my ($w, $h) = $layout->size;
2368 $_->[0] = $w + $_->[3];
2369 $_->[1] = $h;
2370 }
2371
2372 $height += $_->[1];
2373 }
2231 2374
2232 $self->{height} = $height; 2375 $self->{height} = $height;
2233 2376
2234 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2235 2378
2236 delete $self->{texture}; 2379 delete $self->{texture};
2237 } 2380 }
2238 2381
2239 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2240 glClearColor 0, 0, 0, 0; 2383 glClearColor 0.5, 0.5, 0.5, 0;
2241 glClear GL_COLOR_BUFFER_BIT; 2384 glClear GL_COLOR_BUFFER_BIT;
2242 2385
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246 my $top = int $self->{children}[1]{range}[0]; 2386 my $top = int $self->{children}[1]{range}[0];
2247 2387
2248 my $y0 = $top; 2388 my $y0 = $top;
2249 my $y1 = $top + $self->{h}; 2389 my $y1 = $top + $H;
2250 2390
2251 my $y = 0; 2391 my $y = 0;
2252 2392
2253 my $layout = $self->{layout}; 2393 my $layout = $self->{layout};
2254 2394
2255 $layout->set_font ($self->{font}) if $self->{font}; 2395 $layout->set_font ($self->{font}) if $self->{font};
2256 2396
2397 glEnable GL_BLEND;
2398 #TODO# not correct in windows where rgba is forced off
2399 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2400
2257 for my $par (@{$self->{par}}) { 2401 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2402 my $h = $par->[1];
2259 2403
2260 if ($y0 < $y + $h && $y < $y1) { 2404 if ($y0 < $y + $h && $y < $y1) {
2261 $layout->set_foreground (@{ $par->[1] }); 2405 $layout->set_foreground (@{ $par->[2] });
2406 $layout->set_width ($W - $par->[3]);
2262 $layout->set_markup ($par->[2]); 2407 $layout->set_markup ($par->[4]);
2263 2408
2264 my ($W, $H) = $layout->size; 2409 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2410
2411 glRasterPos $par->[3], $y - $y0;
2412 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2413 }
2267 2414
2268 $y += $h; 2415 $y += $h;
2269 } 2416 }
2270 2417
2271 glDisable GL_TEXTURE_2D; 2418 glDisable GL_BLEND;
2272 }; 2419 };
2273 }); 2420 });
2274} 2421}
2275 2422
2276sub _draw { 2423sub _draw {
2277 my ($self) = @_; 2424 my ($self) = @_;
2278 2425
2279 glEnable GL_TEXTURE_2D; 2426 glEnable GL_TEXTURE_2D;
2280 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2281 glColor 1, 1, 1, 1; 2428 glColor 1, 1, 1, 1;
2282 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2429 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2283 glDisable GL_TEXTURE_2D; 2430 glDisable GL_TEXTURE_2D;
2284 2431
2285 $self->{children}[1]->draw; 2432 $self->{children}[1]->draw;
2286 2433
2287} 2434}
… …
2386 2533
2387sub set_tooltip_from { 2534sub set_tooltip_from {
2388 my ($self, $widget) = @_; 2535 my ($self, $widget) = @_;
2389 2536
2390 $self->add (new CFClient::UI::Label 2537 $self->add (new CFClient::UI::Label
2391 markup => $widget->{tooltip}, 2538 markup => $widget->{tooltip},
2392 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393 fontsize => 0.8, 2540 fontsize => 0.8,
2394 fg => [0, 0, 0, 1], 2541 fg => [0, 0, 0, 1],
2542 ellipsise => 0,
2395 font => ($widget->{tooltip_font} || $::FONT_PROP), 2543 font => ($widget->{tooltip_font} || $::FONT_PROP),
2396 ); 2544 );
2397} 2545}
2398 2546
2399sub size_request { 2547sub size_request {
2400 my ($self) = @_; 2548 my ($self) = @_;
… …
2446use CFClient::OpenGL; 2594use CFClient::OpenGL;
2447 2595
2448sub new { 2596sub new {
2449 my $class = shift; 2597 my $class = shift;
2450 2598
2451 $class->SUPER::new ( 2599 my $self = $class->SUPER::new (
2452 aspect => 1, 2600 aspect => 1,
2453 @_, 2601 @_,
2454 ) 2602 );
2603
2604 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self);
2606
2607 $self->{timer} = Event->timer (
2608 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2609 hard => 1,
2610 interval => $self->{animspeed},
2611 cb => sub {
2612 ++$widget->{frame};
2613 $widget->update;
2614 },
2615 );
2616 }
2617
2618 $self
2455} 2619}
2456 2620
2457sub size_request { 2621sub size_request {
2458 (32, 8) 2622 (32, 8)
2459} 2623}
2460 2624
2625sub update {
2626 my ($self) = @_;
2627
2628 return unless $self->{visible};
2629
2630 $self->SUPER::update;
2631}
2632
2461sub _draw { 2633sub _draw {
2462 my ($self) = @_; 2634 my ($self) = @_;
2463 2635
2464 return unless $::CONN;#d# manage and cache textures differently 2636 return unless $::CONN;
2637
2638 my $face;
2639
2640 if ($self->{frame}) {
2641 my $anim = $::CONN->{anim}[$self->{anim}];
2642
2643 $face = $anim->[ $self->{frame} % @$anim ]
2644 if $anim && @$anim;
2645 }
2646
2465 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2466 2648
2467 # TODO animation
2468 if ($tex) { 2649 if ($tex) {
2469 glEnable GL_TEXTURE_2D; 2650 glEnable GL_TEXTURE_2D;
2470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2471 glColor 1, 1, 1, 1; 2652 glColor 1, 1, 1, 1;
2472 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2473 glDisable GL_TEXTURE_2D; 2654 glDisable GL_TEXTURE_2D;
2474 } 2655 }
2475} 2656}
2476 2657
2658sub DESTROY {
2659 my ($self) = @_;
2660
2661 $self->{timer}->cancel
2662 if $self->{timer};
2663
2664 $self->SUPER::DESTROY;
2665}
2666
2477############################################################################# 2667#############################################################################
2478 2668
2479package CFClient::UI::InventoryItem; 2669package CFClient::UI::InventoryItem;
2480 2670
2481our @ISA = CFClient::UI::HBox::; 2671our @ISA = CFClient::UI::HBox::;
2672
2673sub _item_to_desc {
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2482 2698
2483sub new { 2699sub new {
2484 my $class = shift; 2700 my $class = shift;
2485 2701
2486 my %args = @_; 2702 my %args = @_;
2487 2703
2488 my $item = delete $args{item}; 2704 my $item = delete $args{item};
2489 2705
2490 my $desc = $item->{nrof} < 2 2706 my $desc = _item_to_desc ($item);
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494 2707
2495 my $self = $class->SUPER::new ( 2708 my $self = $class->SUPER::new (
2496 can_hover => 1, 2709 can_hover => 1,
2497 can_events => 1, 2710 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc) 2711 tooltip => ((CFClient::UI::Label::escape $desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub { 2713 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_; 2714 my ($self, $ev, $x, $y) = @_;
2502 2715
2503 # todo: maybe put examine on 1? but should just be a tooltip :( 2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2504 if ($ev->{button} == 1) { 2725 } elsif ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2726 $::CONN->send ("examine $item->{tag}");
2506 } elsif ($ev->{button} == 2) { 2727 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}"); 2728 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) { 2729 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new ( 2730 my @menu_items = (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2519 ], 2743 ),
2520 )->popup ($ev); 2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521 } 2747 }
2522 2748
2523 1 2749 1
2524 }, 2750 },
2525 %args 2751 %args
2526 ); 2752 );
2753
2527 2754
2528 $self->add (new CFClient::UI::Face 2755 $self->add (new CFClient::UI::Face
2529 can_events => 0, 2756 can_events => 0,
2530 face => $item->{face}, 2757 face => $item->{face},
2531 anim => $item->{anim}, 2758 anim => $item->{anim},
2532 animspeed => $item->{animspeed}, 2759 animspeed => $item->{animspeed},
2533 ); 2760 );
2534 2761
2535 $self->add (new CFClient::UI::Label 2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536 can_events => 0, 2763
2537 text => $desc, 2764 $self->{item} = $item;
2538 ); 2765
2766 $self->update_item;
2539 2767
2540 $self 2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2541} 2777}
2542 2778
2543############################################################################# 2779#############################################################################
2544 2780
2545package CFClient::UI::Inventory; 2781package CFClient::UI::Inventory;
… …
2548 2784
2549sub new { 2785sub new {
2550 my $class = shift; 2786 my $class = shift;
2551 2787
2552 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox), 2789 scrolled => (new CFClient::UI::Table),
2554 @_, 2790 @_,
2555 ); 2791 );
2556 2792
2557 $self 2793 $self
2558} 2794}
… …
2569 } @$items; 2805 } @$items;
2570 2806
2571 $self->{real_items} = \@items; 2807 $self->{real_items} = \@items;
2572 2808
2573 for my $item (@items) { 2809 for my $item (@items) {
2574 my $desc = $item->{nrof} < 2 2810 $item->{item} = $item;
2575 ? $item->{name}
2576 : "$item->{nrof} $item->{name_pl}";
2577
2578 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2579 } 2813 }
2580 2814
2815 my $i = 0;
2816 for (@items) {
2581 $self->{scrolled}->add (@items); 2817 $self->{scrolled}->add (0, $i, $_);
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2582 2821
2583# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2584} 2823}
2585 2824
2586sub size_request { 2825sub size_request {
… …
2664 2903
2665package CFClient::UI::Statusbox; 2904package CFClient::UI::Statusbox;
2666 2905
2667our @ISA = CFClient::UI::VBox::; 2906our @ISA = CFClient::UI::VBox::;
2668 2907
2908sub new {
2909 my $class = shift;
2910
2911 $class->SUPER::new (
2912 fontsize => 0.8,
2913 @_,
2914 )
2915}
2916
2669sub reorder { 2917sub reorder {
2670 my ($self) = @_; 2918 my ($self) = @_;
2671 my $NOW = time; 2919 my $NOW = time;
2672 2920
2673 while (my ($k, $v) = each %{ $self->{item} }) { 2921 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2691 ? "<b>$item->{count} ×</b> $item->{text}" 2939 ? "<b>$item->{count} ×</b> $item->{text}"
2692 : $item->{text}; 2940 : $item->{text};
2693 2941
2694 for ($short) { 2942 for ($short) {
2695 s/^\s+//; 2943 s/^\s+//;
2696 s/\012.*/…/s; 2944 s/\s+/ /g;
2697 my $len = int 40 / $item->{fontsize};
2698 substr $_, $len, length, "…" if $len < length;
2699 } 2945 }
2700 2946
2701 new CFClient::UI::Label 2947 new CFClient::UI::Label
2702 markup => $short, 2948 markup => $short,
2703 tooltip => $item->{tooltip}, 2949 tooltip => $item->{tooltip},
2704 tooltip_font => $::FONT_PROP, 2950 tooltip_font => $::FONT_PROP,
2705 tooltip_width => 0.67, 2951 tooltip_width => 0.67,
2706 fontsize => $item->{fontsize}, 2952 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44,
2707 color => $item->{color}, 2954 fg => $item->{fg},
2708 can_events => 1, 2955 can_events => 1,
2709 can_hover => 1 2956 can_hover => 1
2710 }; 2957 };
2711 } 2958 }
2712 2959
… …
2738 $self->{item}{$group} = { 2985 $self->{item}{$group} = {
2739 id => ++$self->{id}, 2986 id => ++$self->{id},
2740 text => $text, 2987 text => $text,
2741 timeout => $timeout, 2988 timeout => $timeout,
2742 tooltip => $text, 2989 tooltip => $text,
2743 fontsize => 0.8,
2744 color => [0.8, 0.8, 0.8, 0.8], 2990 fg => [0.8, 0.8, 0.8, 0.8],
2745 pri => 0, 2991 pri => 0,
2746 count => 1, 2992 count => 1,
2747 %arg, 2993 %arg,
2748 }; 2994 };
2749 } 2995 }
2750 2996
2751 $self->reorder; 2997 $self->reorder;
2752} 2998}
2753 2999
3000sub reconfigure {
3001 my ($self) = @_;
3002
3003 delete $_->{label}
3004 for values %{ $self->{item} || {} };
3005
3006 $self->reorder;
3007 $self->SUPER::reconfigure;
3008}
3009
2754############################################################################# 3010#############################################################################
2755 3011
2756package CFClient::UI::Root; 3012package CFClient::UI::Root;
2757 3013
2758our @ISA = CFClient::UI::Container::; 3014our @ISA = CFClient::UI::Container::;
… …
2797 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798 3054
2799 for my $child ($self->children) { 3055 for my $child ($self->children) {
2800 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2801 3057
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3059 if exists $child->{req_x};
3060
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3062 if exists $child->{req_y};
3063
2802 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3064 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2803 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066
2804 $child->configure ($X, $Y, $W, $H); 3067 $child->configure ($X, $Y, $W, $H);
2805 } 3068 }
2806} 3069}
2807 3070
2808sub coord2local { 3071sub coord2local {
… …
2823 $self->check_size; 3086 $self->check_size;
2824 $::WANT_REFRESH++; 3087 $::WANT_REFRESH++;
2825} 3088}
2826 3089
2827sub add { 3090sub add {
2828 my ($self, $child) = @_; 3091 my ($self, @children) = @_;
2829 3092
3093 for my $child (@children) {
3094 $child->{toplevel} = 1;
3095
2830 # integerise window positions 3096 # integerise window positions
2831 $child->{x} = int $child->{x}; 3097 $child->{x} = int $child->{x};
2832 $child->{y} = int $child->{y}; 3098 $child->{y} = int $child->{y};
3099 }
2833 3100
2834 $self->SUPER::add ($child); 3101 $self->SUPER::add (@children);
3102
3103 while (@children) {
3104 my $w = pop @children;
3105 push @children, $w->children;
3106 $w->{visible} = 1;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 }
2835} 3120}
2836 3121
2837sub on_refresh { 3122sub on_refresh {
2838 my ($self, $id, $cb) = @_; 3123 my ($self, $id, $cb) = @_;
2839 3124
… …
2908 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2909 glClear GL_COLOR_BUFFER_BIT; 3194 glClear GL_COLOR_BUFFER_BIT;
2910 3195
2911 glMatrixMode GL_PROJECTION; 3196 glMatrixMode GL_PROJECTION;
2912 glLoadIdentity; 3197 glLoadIdentity;
2913 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2914 glMatrixMode GL_MODELVIEW; 3199 glMatrixMode GL_MODELVIEW;
2915 glLoadIdentity; 3200 glLoadIdentity;
2916 3201
2917 $self->_draw; 3202 $self->_draw;
2918} 3203}
… …
2920############################################################################# 3205#############################################################################
2921 3206
2922package CFClient::UI; 3207package CFClient::UI;
2923 3208
2924$ROOT = new CFClient::UI::Root; 3209$ROOT = new CFClient::UI::Root;
2925$TOOLTIP = new CFClient::UI::Tooltip; 3210$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2926 3211
29271 32121
2928 3213

Diff Legend

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