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

Diff Legend

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