ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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