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.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC

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

Diff Legend

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