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.222 by root, Mon May 22 03:59:51 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);
206} 214}
207 215
208sub hide { 216sub hide {
209 my ($self) = @_; 217 my ($self) = @_;
… …
282sub set_max_size { 290sub set_max_size {
283 my ($self, $w, $h) = @_; 291 my ($self, $w, $h) = @_;
284 292
285 delete $self->{max_w}; $self->{max_w} = $w if $w; 293 delete $self->{max_w}; $self->{max_w} = $w if $w;
286 delete $self->{max_h}; $self->{max_h} = $h if $h; 294 delete $self->{max_h}; $self->{max_h} = $h if $h;
295}
296
297sub set_tooltip {
298 my ($self, $tooltip) = @_;
299
300 $self->{tooltip} = $tooltip;
301
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner};
304 CFClient::UI::check_tooltip;
305 }
287} 306}
288 307
289# translate global coordinates to local coordinate system 308# translate global coordinates to local coordinate system
290sub coord2local { 309sub coord2local {
291 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
… …
377 glVertex $self->{w}, 0; 396 glVertex $self->{w}, 0;
378 glVertex $self->{w}, $self->{h}; 397 glVertex $self->{w}, $self->{h};
379 glVertex 0 , $self->{h}; 398 glVertex 0 , $self->{h};
380 glEnd; 399 glEnd;
381 glPopMatrix; 400 glPopMatrix;
382 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 401 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
383 } 402 }
384} 403}
385 404
386sub _draw { 405sub _draw {
387 my ($self) = @_; 406 my ($self) = @_;
… …
407 Scalar::Util::weaken ($self->{parent} = $parent); 426 Scalar::Util::weaken ($self->{parent} = $parent);
408 427
409 # TODO: req_w _does_change after ->reconfigure 428 # TODO: req_w _does_change after ->reconfigure
410 $self->check_size 429 $self->check_size
411 unless exists $self->{req_w}; 430 unless exists $self->{req_w};
431
432 $self->show;
412} 433}
413 434
414sub check_size { 435sub check_size {
415 my ($self, $forced) = @_; 436 my ($self, $forced) = @_;
416 437
… …
457 my $class = shift; 478 my $class = shift;
458 479
459 # range [value, low, high, page] 480 # range [value, low, high, page]
460 481
461 $class->SUPER::new ( 482 $class->SUPER::new (
462 bg => [0, 0, 0, 0.2], 483 #bg => [0, 0, 0, 0.2],
463 active_bg => [1, 1, 1, 0.5], 484 #active_bg => [1, 1, 1, 0.5],
464 @_ 485 @_
465 ) 486 )
466} 487}
467 488
468sub _draw { 489sub _draw {
469 my ($self) = @_; 490 my ($self) = @_;
470 491
492 my $color = $FOCUS == $self && $self->{active_bg}
493 ? $self->{active_bg}
494 : $self->{bg};
495
496 if ($color && (@$color < 4 || $color->[3])) {
471 my ($w, $h) = @$self{qw(w h)}; 497 my ($w, $h) = @$self{qw(w h)};
472 498
473 glEnable GL_BLEND; 499 glEnable GL_BLEND;
474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
475 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 501 glColor @$color;
476 502
477 glBegin GL_QUADS; 503 glBegin GL_QUADS;
478 glVertex 0 , 0; 504 glVertex 0 , 0;
479 glVertex 0 , $h; 505 glVertex 0 , $h;
480 glVertex $w, $h; 506 glVertex $w, $h;
481 glVertex $w, 0; 507 glVertex $w, 0;
482 glEnd; 508 glEnd;
483 509
484 glDisable GL_BLEND; 510 glDisable GL_BLEND;
511 }
485} 512}
486 513
487############################################################################# 514#############################################################################
488 515
489package CFClient::UI::Empty; 516package CFClient::UI::Empty;
… …
673 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 700 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
674 glClearColor 0, 0, 0, 0; 701 glClearColor 0, 0, 0, 0;
675 glClear GL_COLOR_BUFFER_BIT; 702 glClear GL_COLOR_BUFFER_BIT;
676 703
677 $self->_render; 704 $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 }; 705 };
686} 706}
687 707
688sub _draw { 708sub _draw {
689 my ($self) = @_; 709 my ($self) = @_;
… …
693 my $tex = $self->{texture} 713 my $tex = $self->{texture}
694 or return; 714 or return;
695 715
696 glEnable GL_TEXTURE_2D; 716 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
698 glColor 0, 0, 0, 1; 718 glColor 1, 1, 1, 1;
699 719
700 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 720 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
701 721
702 glDisable GL_TEXTURE_2D; 722 glDisable GL_TEXTURE_2D;
703} 723}
… …
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 }, 807 },
788 ; 808 ;
789 809
790 $self = $class->SUPER::new ( 810 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort), 811 vp => (new CFClient::UI::ViewPort expand => 1),
792 slider => $slider, 812 slider => $slider,
793 @_, 813 @_,
794 ); 814 );
795 815
796 $self->{vp}->add ($self->{scrolled}); 816 $self->{vp}->add ($self->{scrolled});
… …
897 my ($self, $w, $h) = @_; 917 my ($self, $w, $h) = @_;
898 918
899 $h -= List::Util::max 0, $self->border * 2; 919 $h -= List::Util::max 0, $self->border * 2;
900 $w -= List::Util::max 0, $self->border * 2; 920 $w -= List::Util::max 0, $self->border * 2;
901 921
902 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
903 if $self->{title}; 923 if $self->{title};
904 924
905 $self->child->configure ($self->border, $self->border, $w, $h); 925 $self->child->configure ($self->border, $self->border, $w, $h);
906} 926}
907 927
… …
1268 1288
1269############################################################################# 1289#############################################################################
1270 1290
1271package CFClient::UI::Label; 1291package CFClient::UI::Label;
1272 1292
1273our @ISA = CFClient::UI::Base::; 1293our @ISA = CFClient::UI::DrawBG::;
1274 1294
1275use CFClient::OpenGL; 1295use CFClient::OpenGL;
1276 1296
1277sub new { 1297sub new {
1278 my ($class, %arg) = @_; 1298 my ($class, %arg) = @_;
1279 1299
1280 my $self = $class->SUPER::new ( 1300 my $self = $class->SUPER::new (
1281 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1302 #bg => none
1303 #active_bg => none
1282 #font => default_font 1304 #font => default_font
1283 #text => initial text 1305 #text => initial text
1284 #markup => initial narkup 1306 #markup => initial narkup
1307 #max_w => maximum pixel width
1308 ellipsise => 3, # end
1285 layout => (new CFClient::Layout), 1309 layout => (new CFClient::Layout),
1286 fontsize => 1, 1310 fontsize => 1,
1287 align => -1, 1311 align => -1,
1288 valign => -1, 1312 valign => -1,
1289 padding => 2, 1313 padding => 2,
… …
1304 } 1328 }
1305 1329
1306 $self 1330 $self
1307} 1331}
1308 1332
1309sub escape { 1333sub escape($) {
1310 local $_ = $_[1]; 1334 local $_ = $_[0];
1311 1335
1312 s/&/&amp;/g; 1336 s/&/&amp;/g;
1313 s/>/&gt;/g; 1337 s/>/&gt;/g;
1314 s/</&lt;/g; 1338 s/</&lt;/g;
1315 1339
1316 $_[1] 1340 $_
1317} 1341}
1318 1342
1319sub update { 1343sub update {
1320 my ($self) = @_; 1344 my ($self) = @_;
1321 1345
… …
1354sub size_request { 1378sub size_request {
1355 my ($self) = @_; 1379 my ($self) = @_;
1356 1380
1357 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1381 $self->{layout}->set_font ($self->{font}) if $self->{font};
1358 $self->{layout}->set_width ($self->{max_w} || -1); 1382 $self->{layout}->set_width ($self->{max_w} || -1);
1383 $self->{layout}->set_ellipsise ($self->{ellipsise});
1384 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1359 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1360 1386
1361 my ($w, $h) = $self->{layout}->size; 1387 my ($w, $h) = $self->{layout}->size;
1362 1388
1363 if (exists $self->{template}) { 1389 if (exists $self->{template}) {
… …
1393} 1419}
1394 1420
1395sub _draw { 1421sub _draw {
1396 my ($self) = @_; 1422 my ($self) = @_;
1397 1423
1424 $self->SUPER::_draw; # draw background, if applicable
1425
1398 my $tex = $self->{texture} ||= do { 1426 my $tex = $self->{texture} ||= do {
1399 $self->{layout}->set_foreground (@{$self->{fg}}); 1427 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1428 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1429 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1403 1433
1404 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1434 my $tex = new_from_layout CFClient::Texture $self->{layout};
1405 1435
1406 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1407 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408 : ($self->{w} - $tex->{w}) * 0.5; 1438 : ($self->{w} - $tex->{w}) * 0.5);
1409 1439
1410 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1411 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412 : ($self->{h} - $tex->{h}) * 0.5; 1442 : ($self->{h} - $tex->{h}) * 0.5);
1413 1443
1414 $tex 1444 $tex
1415 }; 1445 };
1416 1446
1417 glEnable GL_TEXTURE_2D; 1447 glEnable GL_TEXTURE_2D;
… …
1472sub set_text { 1502sub set_text {
1473 my ($self, $text) = @_; 1503 my ($self, $text) = @_;
1474 1504
1475 $self->{cursor} = length $text; 1505 $self->{cursor} = length $text;
1476 $self->_set_text ($text); 1506 $self->_set_text ($text);
1507 $self->update;
1477 $self->check_size; 1508 $self->check_size;
1478 $self->update;
1479} 1509}
1480 1510
1481sub get_text { 1511sub get_text {
1482 $_[0]{text} 1512 $_[0]{text}
1483} 1513}
… …
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1553 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1554 }
1525 1555
1526 $self->_set_text ($text); 1556 $self->_set_text ($text);
1527 $self->update; 1557 $self->update;
1558 $self->check_size;
1528} 1559}
1529 1560
1530sub focus_in { 1561sub focus_in {
1531 my ($self) = @_; 1562 my ($self) = @_;
1532 1563
… …
1661 my $class = shift; 1692 my $class = shift;
1662 1693
1663 $class->SUPER::new ( 1694 $class->SUPER::new (
1664 padding => 4, 1695 padding => 4,
1665 fg => [1, 1, 1], 1696 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1697 active_fg => [0, 0, 1],
1668 can_hover => 1, 1698 can_hover => 1,
1669 align => 0, 1699 align => 0,
1670 valign => 0, 1700 valign => 0,
1671 can_events => 1, 1701 can_events => 1,
… …
1719 1749
1720 $class->SUPER::new ( 1750 $class->SUPER::new (
1721 padding => 2, 1751 padding => 2,
1722 fg => [1, 1, 1], 1752 fg => [1, 1, 1],
1723 active_fg => [1, 1, 0], 1753 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5],
1724 state => 0, 1756 state => 0,
1725 can_hover => 1, 1757 can_hover => 1,
1726 @_ 1758 @_
1727 ) 1759 )
1728} 1760}
… …
2012 qw(s1_slider.png s1_slider_bg.png); 2044 qw(s1_slider.png s1_slider_bg.png);
2013 2045
2014sub new { 2046sub new {
2015 my $class = shift; 2047 my $class = shift;
2016 2048
2017 # range [value, low, high, page] 2049 # range [value, low, high, page, unit]
2018 2050
2019 # TODO: 0-width page 2051 # TODO: 0-width page
2020 # TODO: req_w/h are wrong with vertical 2052 # TODO: req_w/h are wrong with vertical
2021 # TODO: calculations are off 2053 # TODO: calculations are off
2022 my $self = $class->SUPER::new ( 2054 my $self = $class->SUPER::new (
2023 fg => [1, 1, 1], 2055 fg => [1, 1, 1],
2024 active_fg => [0, 0, 0], 2056 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5],
2025 range => [0, 0, 100, 10], 2059 range => [0, 0, 100, 10],
2026 req_w => $::WIDTH / 80, 2060 req_w => $::WIDTH / 80,
2027 req_h => $::WIDTH / 80, 2061 req_h => $::WIDTH / 80,
2028 vertical => 0, 2062 vertical => 0,
2029 can_hover => 1, 2063 can_hover => 1,
2030 inner_pad => 5, 2064 inner_pad => 0.02,
2031 @_ 2065 @_
2032 ); 2066 );
2033 2067
2068 $self->set_value ($self->{range}[0]);
2069 $self->update;
2070
2034 $self 2071 $self
2072}
2073
2074sub set_value {
2075 my ($self, $value) = @_;
2076
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078
2079 $hi = $lo + 1 if $hi <= $lo;
2080
2081 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi;
2083
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit;
2086
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090
2091 if ($value != $old_value) {
2092 $self->emit (changed => $value);
2093 $self->update;
2094 }
2035} 2095}
2036 2096
2037sub size_request { 2097sub size_request {
2038 my ($self) = @_; 2098 my ($self) = @_;
2039 2099
… …
2052 2112
2053sub mouse_motion { 2113sub mouse_motion {
2054 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
2055 2115
2056 if ($GRAB == $self) { 2116 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118
2119 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2122
2123 $self->set_value ($x * ($hi - $lo) + $lo);
2124 }
2125}
2126
2127sub update {
2128 my ($self) = @_;
2129
2130 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131 $self->set_value ($self->{range}[0]);
2132
2057 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2133 my ($value, $lo, $hi, $page) = @{$self->{range}};
2058 2134
2059 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2135 my $inner_w = 1 - 2 * $self->{inner_pad};
2060 2136
2061 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2137 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2062 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2063 2138
2064 $x -= $inner_pad_px; # substract the padding 2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2065 $x = $x * ($hi - $lo) / $inner_w + $lo; 2140 $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 2141
2070 $self->emit (changed => $x); 2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2071 $self->update; 2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value;
2148 $self->{knob_w} = $page;
2072 } 2149 });
2073}
2074 2150
2075# the inner_* stuff is for generating a padding for the slider handle, 2151 $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} 2152}
2082 2153
2083sub _draw { 2154sub _draw {
2084 my ($self) = @_; 2155 my ($self) = @_;
2085 2156
2086 $self->SUPER::_draw (); 2157 $self->SUPER::_draw ();
2087 2158
2088 my ($w, $h) = @$self{qw(w h)}; 2159 glScale $self->{w}, $self->{h};
2089 2160
2090 if ($self->{vertical}) { 2161 if ($self->{vertical}) {
2091 # draw a vertical slider like a rotated horizontal slider 2162 # draw a vertical slider like a rotated horizontal slider
2092 2163
2164 glTranslate 1, 0, 0;
2093 glRotate 90, 0, 0, 1; 2165 glRotate 90, 0, 0, 1;
2094 glTranslate 0, -$self->{w}, 0;
2095
2096 ($w, $h) = ($h, $w);
2097 } 2166 }
2098 2167
2099 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2168 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2169 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101 2170
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; 2171 glEnable GL_TEXTURE_2D;
2121 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2172 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122 2173
2123 # draw background 2174 # draw background
2124 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2175 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125 2176
2126 # draw handle 2177 # draw handle
2127 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2178 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2128 2179
2129 glDisable GL_TEXTURE_2D; 2180 glDisable GL_TEXTURE_2D;
2130} 2181}
2131 2182
2132############################################################################# 2183#############################################################################
… …
2165 2216
2166 $self->{fontsize} = $fontsize; 2217 $self->{fontsize} = $fontsize;
2167 $self->reflow; 2218 $self->reflow;
2168} 2219}
2169 2220
2221sub size_allocate {
2222 my ($self, $w, $h) = @_;
2223
2224 $self->SUPER::size_allocate ($w, $h);
2225
2226 $self->{layout}->set_font ($self->{font}) if $self->{font};
2227 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2228 $self->{layout}->set_width ($self->{children}[0]{w});
2229
2230 $self->reflow;
2231}
2232
2170sub text_height { 2233sub text_height {
2171 my ($self, $text) = @_; 2234 my ($self, $text, $indent) = @_;
2172 2235
2173 my $layout = $self->{layout}; 2236 my $layout = $self->{layout};
2174 2237
2175 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2176 $layout->set_width ($self->{children}[0]{w}); 2239 $layout->set_width ($self->{children}[0]{w} - $indent);
2177 $layout->set_markup ($text); 2240 $layout->set_markup ($text);
2178 2241
2179 ($layout->size)[1] 2242 ($layout->size)[1]
2180} 2243}
2181 2244
… …
2184 2247
2185 $self->{need_reflow}++; 2248 $self->{need_reflow}++;
2186 $self->update; 2249 $self->update;
2187} 2250}
2188 2251
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 { 2252sub add_paragraph {
2202 my ($self, $color, $text) = @_; 2253 my ($self, $color, $text, $indent) = @_;
2203 2254
2204 #TODO: intelligently "reformat" paragraph 2255 #TODO: intelligently "reformat" paragraph
2205 2256
2257 for my $line (split /\n/, $text) {
2206 my $height = $self->text_height ($text); 2258 my $height = $self->text_height ($line);
2207
2208 $self->{height} += $height; 2259 $self->{height} += $height;
2209
2210 push @{$self->{par}}, [$height, $color, $text]; 2260 push @{$self->{par}}, [$height, $color, $indent, $line];
2261 }
2211 2262
2212 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2263 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2213 $self->{children}[1]->update; 2264 $self->{children}[1]->update;
2214} 2265}
2215 2266
… …
2224 2275
2225 $ROOT->on_post_alloc ($self, sub { 2276 $ROOT->on_post_alloc ($self, sub {
2226 if (delete $self->{need_reflow}) { 2277 if (delete $self->{need_reflow}) {
2227 my $height = 0; 2278 my $height = 0;
2228 2279
2229 $height += $_->[0] = $self->text_height ($_->[2]) 2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2230 for @{$self->{par}}; 2281 for @{$self->{par}};
2231 2282
2232 $self->{height} = $height; 2283 $self->{height} = $height;
2233 2284
2234 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2286 $self->{children}[1]->update;
2235 2287
2236 delete $self->{texture}; 2288 delete $self->{texture};
2237 } 2289 }
2238 2290
2239 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2291 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2240 glClearColor 0, 0, 0, 0; 2292 glClearColor 0.5, 0.5, 0.5, 0;
2241 glClear GL_COLOR_BUFFER_BIT; 2293 glClear GL_COLOR_BUFFER_BIT;
2242
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245 2294
2246 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2247 2296
2248 my $y0 = $top; 2297 my $y0 = $top;
2249 my $y1 = $top + $self->{h}; 2298 my $y1 = $top + $self->{h};
… …
2252 2301
2253 my $layout = $self->{layout}; 2302 my $layout = $self->{layout};
2254 2303
2255 $layout->set_font ($self->{font}) if $self->{font}; 2304 $layout->set_font ($self->{font}) if $self->{font};
2256 2305
2306 glEnable GL_BLEND;
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308
2257 for my $par (@{$self->{par}}) { 2309 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2310 my $h = $par->[0];
2259 2311
2260 if ($y0 < $y + $h && $y < $y1) { 2312 if ($y0 < $y + $h && $y < $y1) {
2261 $layout->set_foreground (@{ $par->[1] }); 2313 $layout->set_foreground (@{ $par->[1] });
2314 $layout->set_width ($self->{w} - $par->[2]);
2262 $layout->set_markup ($par->[2]); 2315 $layout->set_markup ($par->[3]);
2263 2316
2264 my ($W, $H) = $layout->size; 2317 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2318
2319 glRasterPos $par->[2], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2321 }
2267 2322
2268 $y += $h; 2323 $y += $h;
2269 } 2324 }
2270 2325
2271 glDisable GL_TEXTURE_2D; 2326 glDisable GL_BLEND;
2272 }; 2327 };
2273 }); 2328 });
2274} 2329}
2275 2330
2276sub _draw { 2331sub _draw {
2277 my ($self) = @_; 2332 my ($self) = @_;
2278 2333
2279 glEnable GL_TEXTURE_2D; 2334 glEnable GL_TEXTURE_2D;
2280 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2281 glColor 1, 1, 1, 1; 2336 glColor 1, 1, 1, 1;
2282 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2337 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2283 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
2284 2339
2285 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2286 2341
2287} 2342}
… …
2386 2441
2387sub set_tooltip_from { 2442sub set_tooltip_from {
2388 my ($self, $widget) = @_; 2443 my ($self, $widget) = @_;
2389 2444
2390 $self->add (new CFClient::UI::Label 2445 $self->add (new CFClient::UI::Label
2391 markup => $widget->{tooltip}, 2446 markup => $widget->{tooltip},
2392 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393 fontsize => 0.8, 2448 fontsize => 0.8,
2394 fg => [0, 0, 0, 1], 2449 fg => [0, 0, 0, 1],
2450 ellipsise => 0,
2395 font => ($widget->{tooltip_font} || $::FONT_PROP), 2451 font => ($widget->{tooltip_font} || $::FONT_PROP),
2396 ); 2452 );
2397} 2453}
2398 2454
2399sub size_request { 2455sub size_request {
2400 my ($self) = @_; 2456 my ($self) = @_;
… …
2446use CFClient::OpenGL; 2502use CFClient::OpenGL;
2447 2503
2448sub new { 2504sub new {
2449 my $class = shift; 2505 my $class = shift;
2450 2506
2451 $class->SUPER::new ( 2507 my $self = $class->SUPER::new (
2452 aspect => 1, 2508 aspect => 1,
2453 @_, 2509 @_,
2454 ) 2510 );
2511
2512 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self);
2514
2515 $self->{timer} = Event->timer (
2516 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2517 hard => 1,
2518 interval => $self->{animspeed},
2519 cb => sub {
2520 ++$widget->{frame};
2521 $widget->update;
2522 },
2523 );
2524 }
2525
2526 $self
2455} 2527}
2456 2528
2457sub size_request { 2529sub size_request {
2458 (32, 8) 2530 (32, 8)
2459} 2531}
2460 2532
2533sub update {
2534 my ($self) = @_;
2535
2536 return unless $self->{visible};
2537
2538 $self->SUPER::update;
2539}
2540
2461sub _draw { 2541sub _draw {
2462 my ($self) = @_; 2542 my ($self) = @_;
2463 2543
2464 return unless $::CONN;#d# manage and cache textures differently 2544 return unless $::CONN;#d# manage and cache textures differently
2545
2546 my $face;
2547
2548 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}];
2550
2551 $face = $anim->[ $self->{frame} % @$anim ]
2552 if $anim && @$anim;
2553 }
2554
2465 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2555 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2466 2556
2467 # TODO animation
2468 if ($tex) { 2557 if ($tex) {
2469 glEnable GL_TEXTURE_2D; 2558 glEnable GL_TEXTURE_2D;
2470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2559 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2471 glColor 1, 1, 1, 1; 2560 glColor 1, 1, 1, 1;
2472 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2561 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2473 glDisable GL_TEXTURE_2D; 2562 glDisable GL_TEXTURE_2D;
2474 } 2563 }
2475} 2564}
2476 2565
2566sub DESTROY {
2567 my ($self) = @_;
2568
2569 $self->{timer}->cancel
2570 if $self->{timer};
2571
2572 $self->SUPER::DESTROY;
2573}
2574
2477############################################################################# 2575#############################################################################
2478 2576
2479package CFClient::UI::InventoryItem; 2577package CFClient::UI::InventoryItem;
2480 2578
2481our @ISA = CFClient::UI::HBox::; 2579our @ISA = CFClient::UI::HBox::;
2580
2581sub _item_to_desc {
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2482 2606
2483sub new { 2607sub new {
2484 my $class = shift; 2608 my $class = shift;
2485 2609
2486 my %args = @_; 2610 my %args = @_;
2487 2611
2488 my $item = delete $args{item}; 2612 my $item = delete $args{item};
2489 2613
2490 my $desc = $item->{nrof} < 2 2614 my $desc = _item_to_desc ($item);
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494 2615
2495 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2496 can_hover => 1, 2617 can_hover => 1,
2497 can_events => 1, 2618 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc) 2619 tooltip => ((CFClient::UI::Label::escape $desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub { 2621 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_; 2622 my ($self, $ev, $x, $y) = @_;
2502 2623
2503 # todo: maybe put examine on 1? but should just be a tooltip :( 2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) { 2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2632 $::CONN->send ("move $targ $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) { 2633 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}"); 2634 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) { 2635 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new ( 2636 my @menu_items = (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2637 ["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}") }], 2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2519 ], 2649 ),
2520 )->popup ($ev); 2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521 } 2653 }
2522 2654
2523 1 2655 1
2524 }, 2656 },
2525 %args 2657 %args
2526 ); 2658 );
2659
2527 2660
2528 $self->add (new CFClient::UI::Face 2661 $self->add (new CFClient::UI::Face
2529 can_events => 0, 2662 can_events => 0,
2530 face => $item->{face}, 2663 face => $item->{face},
2531 anim => $item->{anim}, 2664 anim => $item->{anim},
2532 animspeed => $item->{animspeed}, 2665 animspeed => $item->{animspeed},
2533 ); 2666 );
2534 2667
2535 $self->add (new CFClient::UI::Label 2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536 can_events => 0, 2669
2537 text => $desc, 2670 $self->{item} = $item;
2538 ); 2671
2672 $self->update_item;
2539 2673
2540 $self 2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2541} 2683}
2542 2684
2543############################################################################# 2685#############################################################################
2544 2686
2545package CFClient::UI::Inventory; 2687package CFClient::UI::Inventory;
… …
2569 } @$items; 2711 } @$items;
2570 2712
2571 $self->{real_items} = \@items; 2713 $self->{real_items} = \@items;
2572 2714
2573 for my $item (@items) { 2715 for my $item (@items) {
2574 my $desc = $item->{nrof} < 2
2575 ? $item->{name}
2576 : "$item->{nrof} $item->{name_pl}";
2577
2578 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2579 } 2718 }
2580 2719
2581 $self->{scrolled}->add (@items); 2720 $self->{scrolled}->add (@items);
2582 2721
2583# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
… …
2664 2803
2665package CFClient::UI::Statusbox; 2804package CFClient::UI::Statusbox;
2666 2805
2667our @ISA = CFClient::UI::VBox::; 2806our @ISA = CFClient::UI::VBox::;
2668 2807
2808sub new {
2809 my $class = shift;
2810
2811 $class->SUPER::new (
2812 fontsize => 0.8,
2813 @_,
2814 )
2815}
2816
2669sub reorder { 2817sub reorder {
2670 my ($self) = @_; 2818 my ($self) = @_;
2671 my $NOW = time; 2819 my $NOW = time;
2672 2820
2673 while (my ($k, $v) = each %{ $self->{item} }) { 2821 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2691 ? "<b>$item->{count} ×</b> $item->{text}" 2839 ? "<b>$item->{count} ×</b> $item->{text}"
2692 : $item->{text}; 2840 : $item->{text};
2693 2841
2694 for ($short) { 2842 for ($short) {
2695 s/^\s+//; 2843 s/^\s+//;
2696 s/\012.*/…/s; 2844 s/\s+/ /g;
2697 my $len = int 40 / $item->{fontsize};
2698 substr $_, $len, length, "…" if $len < length;
2699 } 2845 }
2700 2846
2701 new CFClient::UI::Label 2847 new CFClient::UI::Label
2702 markup => $short, 2848 markup => $short,
2703 tooltip => $item->{tooltip}, 2849 tooltip => $item->{tooltip},
2704 tooltip_font => $::FONT_PROP, 2850 tooltip_font => $::FONT_PROP,
2705 tooltip_width => 0.67, 2851 tooltip_width => 0.67,
2706 fontsize => $item->{fontsize}, 2852 fontsize => $item->{fontsize} || $self->{fontsize},
2853 max_w => $::WIDTH * 0.44,
2707 color => $item->{color}, 2854 fg => $item->{fg},
2708 can_events => 1, 2855 can_events => 1,
2709 can_hover => 1 2856 can_hover => 1
2710 }; 2857 };
2711 } 2858 }
2712 2859
… …
2738 $self->{item}{$group} = { 2885 $self->{item}{$group} = {
2739 id => ++$self->{id}, 2886 id => ++$self->{id},
2740 text => $text, 2887 text => $text,
2741 timeout => $timeout, 2888 timeout => $timeout,
2742 tooltip => $text, 2889 tooltip => $text,
2743 fontsize => 0.8,
2744 color => [0.8, 0.8, 0.8, 0.8], 2890 fg => [0.8, 0.8, 0.8, 0.8],
2745 pri => 0, 2891 pri => 0,
2746 count => 1, 2892 count => 1,
2747 %arg, 2893 %arg,
2748 }; 2894 };
2749 } 2895 }
2750 2896
2751 $self->reorder; 2897 $self->reorder;
2752} 2898}
2753 2899
2900sub reconfigure {
2901 my ($self) = @_;
2902
2903 delete $_->{label}
2904 for values %{ $self->{item} || {} };
2905
2906 $self->reorder;
2907 $self->SUPER::reconfigure;
2908}
2909
2754############################################################################# 2910#############################################################################
2755 2911
2756package CFClient::UI::Root; 2912package CFClient::UI::Root;
2757 2913
2758our @ISA = CFClient::UI::Container::; 2914our @ISA = CFClient::UI::Container::;
… …
2797 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798 2954
2799 for my $child ($self->children) { 2955 for my $child ($self->children) {
2800 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2801 2957
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2959 if exists $child->{req_x};
2960
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2962 if exists $child->{req_y};
2963
2802 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2964 $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; 2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966
2804 $child->configure ($X, $Y, $W, $H); 2967 $child->configure ($X, $Y, $W, $H);
2805 } 2968 }
2806} 2969}
2807 2970
2808sub coord2local { 2971sub coord2local {
… …
2823 $self->check_size; 2986 $self->check_size;
2824 $::WANT_REFRESH++; 2987 $::WANT_REFRESH++;
2825} 2988}
2826 2989
2827sub add { 2990sub add {
2828 my ($self, $child) = @_; 2991 my ($self, @children) = @_;
2829 2992
2993 for my $child (@children) {
2994 $child->{toplevel} = 1;
2995
2830 # integerise window positions 2996 # integerise window positions
2831 $child->{x} = int $child->{x}; 2997 $child->{x} = int $child->{x};
2832 $child->{y} = int $child->{y}; 2998 $child->{y} = int $child->{y};
2999 }
2833 3000
2834 $self->SUPER::add ($child); 3001 $self->SUPER::add (@children);
3002
3003 while (@children) {
3004 my $w = pop @children;
3005 push @children, $w->children;
3006 $w->{visible} = 1;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 }
2835} 3020}
2836 3021
2837sub on_refresh { 3022sub on_refresh {
2838 my ($self, $id, $cb) = @_; 3023 my ($self, $id, $cb) = @_;
2839 3024
… …
2908 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2909 glClear GL_COLOR_BUFFER_BIT; 3094 glClear GL_COLOR_BUFFER_BIT;
2910 3095
2911 glMatrixMode GL_PROJECTION; 3096 glMatrixMode GL_PROJECTION;
2912 glLoadIdentity; 3097 glLoadIdentity;
2913 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2914 glMatrixMode GL_MODELVIEW; 3099 glMatrixMode GL_MODELVIEW;
2915 glLoadIdentity; 3100 glLoadIdentity;
2916 3101
2917 $self->_draw; 3102 $self->_draw;
2918} 3103}
… …
2920############################################################################# 3105#############################################################################
2921 3106
2922package CFClient::UI; 3107package CFClient::UI;
2923 3108
2924$ROOT = new CFClient::UI::Root; 3109$ROOT = new CFClient::UI::Root;
2925$TOOLTIP = new CFClient::UI::Tooltip; 3110$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2926 3111
29271 31121
2928 3113

Diff Legend

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