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

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

Diff Legend

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