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.224 by elmex, Tue May 23 20:00:55 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}
… …
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 }, 820 },
788 ; 821 ;
789 822
790 $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort), 824 vp => (new CFClient::UI::ViewPort expand => 1),
792 slider => $slider, 825 slider => $slider,
793 @_, 826 @_,
794 ); 827 );
795 828
796 $self->{vp}->add ($self->{scrolled}); 829 $self->{vp}->add ($self->{scrolled});
… …
897 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
898 931
899 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
900 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
901 934
902 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
903 if $self->{title}; 936 if $self->{title};
904 937
905 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
906} 939}
907 940
… …
1268 1301
1269############################################################################# 1302#############################################################################
1270 1303
1271package CFClient::UI::Label; 1304package CFClient::UI::Label;
1272 1305
1273our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1274 1307
1275use CFClient::OpenGL; 1308use CFClient::OpenGL;
1276 1309
1277sub new { 1310sub new {
1278 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1279 1312
1280 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1281 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1282 #font => default_font 1317 #font => default_font
1283 #text => initial text 1318 #text => initial text
1284 #markup => initial narkup 1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1285 layout => (new CFClient::Layout), 1322 layout => (new CFClient::Layout),
1286 fontsize => 1, 1323 fontsize => 1,
1287 align => -1, 1324 align => -1,
1288 valign => -1, 1325 valign => -1,
1289 padding => 2, 1326 padding => 2,
… …
1304 } 1341 }
1305 1342
1306 $self 1343 $self
1307} 1344}
1308 1345
1309sub escape { 1346sub escape($) {
1310 local $_ = $_[1]; 1347 local $_ = $_[0];
1311 1348
1312 s/&/&amp;/g; 1349 s/&/&amp;/g;
1313 s/>/&gt;/g; 1350 s/>/&gt;/g;
1314 s/</&lt;/g; 1351 s/</&lt;/g;
1315 1352
1316 $_[1] 1353 $_
1317} 1354}
1318 1355
1319sub update { 1356sub update {
1320 my ($self) = @_; 1357 my ($self) = @_;
1321 1358
… …
1354sub size_request { 1391sub size_request {
1355 my ($self) = @_; 1392 my ($self) = @_;
1356 1393
1357 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1358 $self->{layout}->set_width ($self->{max_w} || -1); 1395 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1359 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1360 1399
1361 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1362 1401
1363 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1393} 1432}
1394 1433
1395sub _draw { 1434sub _draw {
1396 my ($self) = @_; 1435 my ($self) = @_;
1397 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1398 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1399 $self->{layout}->set_foreground (@{$self->{fg}}); 1440 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1442 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1403 1446
1404 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1405 1448
1406 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1407 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408 : ($self->{w} - $tex->{w}) * 0.5; 1451 : ($self->{w} - $tex->{w}) * 0.5);
1409 1452
1410 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1411 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412 : ($self->{h} - $tex->{h}) * 0.5; 1455 : ($self->{h} - $tex->{h}) * 0.5);
1413 1456
1414 $tex 1457 $tex
1415 }; 1458 };
1416 1459
1417 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
… …
1472sub set_text { 1515sub set_text {
1473 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1474 1517
1475 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1476 $self->_set_text ($text); 1519 $self->_set_text ($text);
1520 $self->update;
1477 $self->check_size; 1521 $self->check_size;
1478 $self->update;
1479} 1522}
1480 1523
1481sub get_text { 1524sub get_text {
1482 $_[0]{text} 1525 $_[0]{text}
1483} 1526}
… …
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1567 }
1525 1568
1526 $self->_set_text ($text); 1569 $self->_set_text ($text);
1527 $self->update; 1570 $self->update;
1571 $self->check_size;
1528} 1572}
1529 1573
1530sub focus_in { 1574sub focus_in {
1531 my ($self) = @_; 1575 my ($self) = @_;
1532 1576
… …
1661 my $class = shift; 1705 my $class = shift;
1662 1706
1663 $class->SUPER::new ( 1707 $class->SUPER::new (
1664 padding => 4, 1708 padding => 4,
1665 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1668 can_hover => 1, 1711 can_hover => 1,
1669 align => 0, 1712 align => 0,
1670 valign => 0, 1713 valign => 0,
1671 can_events => 1, 1714 can_events => 1,
… …
1719 1762
1720 $class->SUPER::new ( 1763 $class->SUPER::new (
1721 padding => 2, 1764 padding => 2,
1722 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1723 active_fg => [1, 1, 0], 1766 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5],
1724 state => 0, 1769 state => 0,
1725 can_hover => 1, 1770 can_hover => 1,
1726 @_ 1771 @_
1727 ) 1772 )
1728} 1773}
… …
2012 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
2013 2058
2014sub new { 2059sub new {
2015 my $class = shift; 2060 my $class = shift;
2016 2061
2017 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
2018 2063
2019 # TODO: 0-width page 2064 # TODO: 0-width page
2020 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
2021 # TODO: calculations are off 2066 # TODO: calculations are off
2022 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
2023 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
2024 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5],
2025 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
2026 req_w => $::WIDTH / 80, 2073 req_w => $::WIDTH / 80,
2027 req_h => $::WIDTH / 80, 2074 req_h => $::WIDTH / 80,
2028 vertical => 0, 2075 vertical => 0,
2029 can_hover => 1, 2076 can_hover => 1,
2030 inner_pad => 5, 2077 inner_pad => 0.02,
2031 @_ 2078 @_
2032 ); 2079 );
2033 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
2034 $self 2084 $self
2085}
2086
2087sub set_value {
2088 my ($self, $value) = @_;
2089
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091
2092 $hi = $lo + 1 if $hi <= $lo;
2093
2094 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi;
2096
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103
2104 if ($value != $old_value) {
2105 $self->emit (changed => $value);
2106 $self->update;
2107 }
2035} 2108}
2036 2109
2037sub size_request { 2110sub size_request {
2038 my ($self) = @_; 2111 my ($self) = @_;
2039 2112
… …
2052 2125
2053sub mouse_motion { 2126sub mouse_motion {
2054 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
2055 2128
2056 if ($GRAB == $self) { 2129 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131
2132 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2135
2136 $self->set_value ($x * ($hi - $lo) + $lo);
2137 }
2138}
2139
2140sub update {
2141 my ($self) = @_;
2142
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]);
2145
2057 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
2058 2147
2059 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
2060 2149
2061 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2062 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2063 2151
2064 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2065 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
2066 $x = $lo if $x < $lo;
2067 $x = $hi - $page if $x > $hi - $page;
2068 $self->{range}[0] = $x;
2069 2154
2070 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2071 $self->update; 2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value;
2161 $self->{knob_w} = $page;
2072 } 2162 });
2073}
2074 2163
2075# the inner_* stuff is for generating a padding for the slider handle, 2164 $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} 2165}
2082 2166
2083sub _draw { 2167sub _draw {
2084 my ($self) = @_; 2168 my ($self) = @_;
2085 2169
2086 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
2087 2171
2088 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
2089 2173
2090 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
2091 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
2092 2176
2177 glTranslate 1, 0, 0;
2093 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
2094 glTranslate 0, -$self->{w}, 0;
2095
2096 ($w, $h) = ($h, $w);
2097 } 2179 }
2098 2180
2099 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101 2183
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; 2184 glEnable GL_TEXTURE_2D;
2121 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122 2186
2123 # draw background 2187 # draw background
2124 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125 2189
2126 # draw handle 2190 # draw handle
2127 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2128 2192
2129 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
2130} 2194}
2131 2195
2132############################################################################# 2196#############################################################################
… …
2165 2229
2166 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
2167 $self->reflow; 2231 $self->reflow;
2168} 2232}
2169 2233
2234sub size_allocate {
2235 my ($self, $w, $h) = @_;
2236
2237 $self->SUPER::size_allocate ($w, $h);
2238
2239 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $self->{layout}->set_width ($self->{children}[0]{w});
2242
2243 $self->reflow;
2244}
2245
2170sub text_height { 2246sub text_height {
2171 my ($self, $text) = @_; 2247 my ($self, $text, $indent) = @_;
2172 2248
2173 my $layout = $self->{layout}; 2249 my $layout = $self->{layout};
2174 2250
2175 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2176 $layout->set_width ($self->{children}[0]{w}); 2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2177 $layout->set_markup ($text); 2253 $layout->set_markup ($text);
2178 2254
2179 ($layout->size)[1] 2255 ($layout->size)[1]
2180} 2256}
2181 2257
… …
2184 2260
2185 $self->{need_reflow}++; 2261 $self->{need_reflow}++;
2186 $self->update; 2262 $self->update;
2187} 2263}
2188 2264
2189sub size_allocate {
2190 my ($self, $w, $h) = @_;
2191
2192 $self->SUPER::size_allocate ($w, $h);
2193
2194 $self->{layout}->set_font ($self->{font}) if $self->{font};
2195 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2196 $self->{layout}->set_width ($self->{children}[0]{w});
2197
2198 $self->reflow;
2199}
2200
2201sub add_paragraph { 2265sub add_paragraph {
2202 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2203 2267
2204 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2205 2269
2270 for my $line (split /\n/, $text) {
2206 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2207
2208 $self->{height} += $height; 2272 $self->{height} += $height;
2209
2210 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2211 2275
2212 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2213 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2214} 2278}
2215 2279
… …
2224 2288
2225 $ROOT->on_post_alloc ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2226 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2227 my $height = 0; 2291 my $height = 0;
2228 2292
2229 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2230 for @{$self->{par}}; 2294 for @{$self->{par}};
2231 2295
2232 $self->{height} = $height; 2296 $self->{height} = $height;
2233 2297
2234 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2299 $self->{children}[1]->update;
2235 2300
2236 delete $self->{texture}; 2301 delete $self->{texture};
2237 } 2302 }
2238 2303
2239 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2240 glClearColor 0, 0, 0, 0; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2241 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2242
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245 2307
2246 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2247 2309
2248 my $y0 = $top; 2310 my $y0 = $top;
2249 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2252 2314
2253 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2254 2316
2255 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2256 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2257 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2323 my $h = $par->[0];
2259 2324
2260 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2261 $layout->set_foreground (@{ $par->[1] }); 2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2262 $layout->set_markup ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2263 2329
2264 my ($W, $H) = $layout->size; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2331
2332 glRasterPos $par->[2], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2334 }
2267 2335
2268 $y += $h; 2336 $y += $h;
2269 } 2337 }
2270 2338
2271 glDisable GL_TEXTURE_2D; 2339 glDisable GL_BLEND;
2272 }; 2340 };
2273 }); 2341 });
2274} 2342}
2275 2343
2276sub _draw { 2344sub _draw {
2277 my ($self) = @_; 2345 my ($self) = @_;
2278 2346
2279 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2280 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2281 glColor 1, 1, 1, 1; 2349 glColor 1, 1, 1, 1;
2282 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2283 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2284 2352
2285 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2286 2354
2287} 2355}
… …
2386 2454
2387sub set_tooltip_from { 2455sub set_tooltip_from {
2388 my ($self, $widget) = @_; 2456 my ($self, $widget) = @_;
2389 2457
2390 $self->add (new CFClient::UI::Label 2458 $self->add (new CFClient::UI::Label
2391 markup => $widget->{tooltip}, 2459 markup => $widget->{tooltip},
2392 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393 fontsize => 0.8, 2461 fontsize => 0.8,
2394 fg => [0, 0, 0, 1], 2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2395 font => ($widget->{tooltip_font} || $::FONT_PROP), 2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2396 ); 2465 );
2397} 2466}
2398 2467
2399sub size_request { 2468sub size_request {
2400 my ($self) = @_; 2469 my ($self) = @_;
… …
2446use CFClient::OpenGL; 2515use CFClient::OpenGL;
2447 2516
2448sub new { 2517sub new {
2449 my $class = shift; 2518 my $class = shift;
2450 2519
2451 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2452 aspect => 1, 2521 aspect => 1,
2453 @_, 2522 @_,
2454 ) 2523 );
2524
2525 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self);
2527
2528 $self->{timer} = Event->timer (
2529 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2530 hard => 1,
2531 interval => $self->{animspeed},
2532 cb => sub {
2533 ++$widget->{frame};
2534 $widget->update;
2535 },
2536 );
2537 }
2538
2539 $self
2455} 2540}
2456 2541
2457sub size_request { 2542sub size_request {
2458 (32, 8) 2543 (32, 8)
2459} 2544}
2460 2545
2546sub update {
2547 my ($self) = @_;
2548
2549 return unless $self->{visible};
2550
2551 $self->SUPER::update;
2552}
2553
2461sub _draw { 2554sub _draw {
2462 my ($self) = @_; 2555 my ($self) = @_;
2463 2556
2464 return unless $::CONN;#d# manage and cache textures differently 2557 return unless $::CONN;#d# manage and cache textures differently
2558
2559 my $face;
2560
2561 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}];
2563
2564 $face = $anim->[ $self->{frame} % @$anim ]
2565 if $anim && @$anim;
2566 }
2567
2465 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2466 2569
2467 # TODO animation
2468 if ($tex) { 2570 if ($tex) {
2469 glEnable GL_TEXTURE_2D; 2571 glEnable GL_TEXTURE_2D;
2470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2471 glColor 1, 1, 1, 1; 2573 glColor 1, 1, 1, 1;
2472 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2473 glDisable GL_TEXTURE_2D; 2575 glDisable GL_TEXTURE_2D;
2474 } 2576 }
2475} 2577}
2476 2578
2579sub DESTROY {
2580 my ($self) = @_;
2581
2582 $self->{timer}->cancel
2583 if $self->{timer};
2584
2585 $self->SUPER::DESTROY;
2586}
2587
2477############################################################################# 2588#############################################################################
2478 2589
2479package CFClient::UI::InventoryItem; 2590package CFClient::UI::InventoryItem;
2480 2591
2481our @ISA = CFClient::UI::HBox::; 2592our @ISA = CFClient::UI::HBox::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2482 2619
2483sub new { 2620sub new {
2484 my $class = shift; 2621 my $class = shift;
2485 2622
2486 my %args = @_; 2623 my %args = @_;
2487 2624
2488 my $item = delete $args{item}; 2625 my $item = delete $args{item};
2489 2626
2490 my $desc = $item->{nrof} < 2 2627 my $desc = _item_to_desc ($item);
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494 2628
2495 my $self = $class->SUPER::new ( 2629 my $self = $class->SUPER::new (
2496 can_hover => 1, 2630 can_hover => 1,
2497 can_events => 1, 2631 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc) 2632 tooltip => ((CFClient::UI::Label::escape $desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub { 2634 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2502 2636
2503 # todo: maybe put examine on 1? but should just be a tooltip :( 2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2504 if ($ev->{button} == 1) { 2646 } elsif ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2647 $::CONN->send ("examine $item->{tag}");
2506 } elsif ($ev->{button} == 2) { 2648 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}"); 2649 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) { 2650 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new ( 2651 my @menu_items = (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2652 ["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}") }], 2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2519 ], 2664 ),
2520 )->popup ($ev); 2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521 } 2668 }
2522 2669
2523 1 2670 1
2524 }, 2671 },
2525 %args 2672 %args
2526 ); 2673 );
2674
2527 2675
2528 $self->add (new CFClient::UI::Face 2676 $self->add (new CFClient::UI::Face
2529 can_events => 0, 2677 can_events => 0,
2530 face => $item->{face}, 2678 face => $item->{face},
2531 anim => $item->{anim}, 2679 anim => $item->{anim},
2532 animspeed => $item->{animspeed}, 2680 animspeed => $item->{animspeed},
2533 ); 2681 );
2534 2682
2535 $self->add (new CFClient::UI::Label 2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536 can_events => 0, 2684
2537 text => $desc, 2685 $self->{item} = $item;
2538 ); 2686
2687 $self->update_item;
2539 2688
2540 $self 2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2541} 2698}
2542 2699
2543############################################################################# 2700#############################################################################
2544 2701
2545package CFClient::UI::Inventory; 2702package CFClient::UI::Inventory;
… …
2548 2705
2549sub new { 2706sub new {
2550 my $class = shift; 2707 my $class = shift;
2551 2708
2552 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox), 2710 scrolled => (new CFClient::UI::Table),
2554 @_, 2711 @_,
2555 ); 2712 );
2556 2713
2557 $self 2714 $self
2558} 2715}
… …
2569 } @$items; 2726 } @$items;
2570 2727
2571 $self->{real_items} = \@items; 2728 $self->{real_items} = \@items;
2572 2729
2573 for my $item (@items) { 2730 for my $item (@items) {
2574 my $desc = $item->{nrof} < 2 2731 $item->{item} = $item;
2575 ? $item->{name}
2576 : "$item->{nrof} $item->{name_pl}";
2577
2578 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2579 } 2734 }
2580 2735
2736 my $i = 0;
2737 for (@items) {
2581 $self->{scrolled}->add (@items); 2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2582 2742
2583# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2584} 2744}
2585 2745
2586sub size_request { 2746sub size_request {
… …
2664 2824
2665package CFClient::UI::Statusbox; 2825package CFClient::UI::Statusbox;
2666 2826
2667our @ISA = CFClient::UI::VBox::; 2827our @ISA = CFClient::UI::VBox::;
2668 2828
2829sub new {
2830 my $class = shift;
2831
2832 $class->SUPER::new (
2833 fontsize => 0.8,
2834 @_,
2835 )
2836}
2837
2669sub reorder { 2838sub reorder {
2670 my ($self) = @_; 2839 my ($self) = @_;
2671 my $NOW = time; 2840 my $NOW = time;
2672 2841
2673 while (my ($k, $v) = each %{ $self->{item} }) { 2842 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2691 ? "<b>$item->{count} ×</b> $item->{text}" 2860 ? "<b>$item->{count} ×</b> $item->{text}"
2692 : $item->{text}; 2861 : $item->{text};
2693 2862
2694 for ($short) { 2863 for ($short) {
2695 s/^\s+//; 2864 s/^\s+//;
2696 s/\012.*/…/s; 2865 s/\s+/ /g;
2697 my $len = int 40 / $item->{fontsize};
2698 substr $_, $len, length, "…" if $len < length;
2699 } 2866 }
2700 2867
2701 new CFClient::UI::Label 2868 new CFClient::UI::Label
2702 markup => $short, 2869 markup => $short,
2703 tooltip => $item->{tooltip}, 2870 tooltip => $item->{tooltip},
2704 tooltip_font => $::FONT_PROP, 2871 tooltip_font => $::FONT_PROP,
2705 tooltip_width => 0.67, 2872 tooltip_width => 0.67,
2706 fontsize => $item->{fontsize}, 2873 fontsize => $item->{fontsize} || $self->{fontsize},
2874 max_w => $::WIDTH * 0.44,
2707 color => $item->{color}, 2875 fg => $item->{fg},
2708 can_events => 1, 2876 can_events => 1,
2709 can_hover => 1 2877 can_hover => 1
2710 }; 2878 };
2711 } 2879 }
2712 2880
… …
2738 $self->{item}{$group} = { 2906 $self->{item}{$group} = {
2739 id => ++$self->{id}, 2907 id => ++$self->{id},
2740 text => $text, 2908 text => $text,
2741 timeout => $timeout, 2909 timeout => $timeout,
2742 tooltip => $text, 2910 tooltip => $text,
2743 fontsize => 0.8,
2744 color => [0.8, 0.8, 0.8, 0.8], 2911 fg => [0.8, 0.8, 0.8, 0.8],
2745 pri => 0, 2912 pri => 0,
2746 count => 1, 2913 count => 1,
2747 %arg, 2914 %arg,
2748 }; 2915 };
2749 } 2916 }
2750 2917
2751 $self->reorder; 2918 $self->reorder;
2752} 2919}
2753 2920
2921sub reconfigure {
2922 my ($self) = @_;
2923
2924 delete $_->{label}
2925 for values %{ $self->{item} || {} };
2926
2927 $self->reorder;
2928 $self->SUPER::reconfigure;
2929}
2930
2754############################################################################# 2931#############################################################################
2755 2932
2756package CFClient::UI::Root; 2933package CFClient::UI::Root;
2757 2934
2758our @ISA = CFClient::UI::Container::; 2935our @ISA = CFClient::UI::Container::;
… …
2797 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798 2975
2799 for my $child ($self->children) { 2976 for my $child ($self->children) {
2800 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2801 2978
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2980 if exists $child->{req_x};
2981
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2983 if exists $child->{req_y};
2984
2802 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2985 $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; 2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987
2804 $child->configure ($X, $Y, $W, $H); 2988 $child->configure ($X, $Y, $W, $H);
2805 } 2989 }
2806} 2990}
2807 2991
2808sub coord2local { 2992sub coord2local {
… …
2823 $self->check_size; 3007 $self->check_size;
2824 $::WANT_REFRESH++; 3008 $::WANT_REFRESH++;
2825} 3009}
2826 3010
2827sub add { 3011sub add {
2828 my ($self, $child) = @_; 3012 my ($self, @children) = @_;
2829 3013
3014 for my $child (@children) {
3015 $child->{toplevel} = 1;
3016
2830 # integerise window positions 3017 # integerise window positions
2831 $child->{x} = int $child->{x}; 3018 $child->{x} = int $child->{x};
2832 $child->{y} = int $child->{y}; 3019 $child->{y} = int $child->{y};
3020 }
2833 3021
2834 $self->SUPER::add ($child); 3022 $self->SUPER::add (@children);
3023
3024 while (@children) {
3025 my $w = pop @children;
3026 push @children, $w->children;
3027 $w->{visible} = 1;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 }
2835} 3041}
2836 3042
2837sub on_refresh { 3043sub on_refresh {
2838 my ($self, $id, $cb) = @_; 3044 my ($self, $id, $cb) = @_;
2839 3045
… …
2908 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2909 glClear GL_COLOR_BUFFER_BIT; 3115 glClear GL_COLOR_BUFFER_BIT;
2910 3116
2911 glMatrixMode GL_PROJECTION; 3117 glMatrixMode GL_PROJECTION;
2912 glLoadIdentity; 3118 glLoadIdentity;
2913 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2914 glMatrixMode GL_MODELVIEW; 3120 glMatrixMode GL_MODELVIEW;
2915 glLoadIdentity; 3121 glLoadIdentity;
2916 3122
2917 $self->_draw; 3123 $self->_draw;
2918} 3124}
… …
2920############################################################################# 3126#############################################################################
2921 3127
2922package CFClient::UI; 3128package CFClient::UI;
2923 3129
2924$ROOT = new CFClient::UI::Root; 3130$ROOT = new CFClient::UI::Root;
2925$TOOLTIP = new CFClient::UI::Tooltip; 3131$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2926 3132
29271 31331
2928 3134

Diff Legend

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