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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00: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};
… …
195 %$self = (); 206 %$self = ();
196} 207}
197 208
198sub show { 209sub show {
199 my ($self) = @_; 210 my ($self) = @_;
200
201 return if $self->{parent}; 211 return if $self->{parent};
202 212
203 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
204} 227}
205 228
206sub hide { 229sub hide {
207 my ($self) = @_; 230 my ($self) = @_;
208 231
… …
280sub set_max_size { 303sub set_max_size {
281 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
282 305
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
308}
309
310sub set_tooltip {
311 my ($self, $tooltip) = @_;
312
313 $self->{tooltip} = $tooltip;
314
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
285} 319}
286 320
287# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
288sub coord2local { 322sub coord2local {
289 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
405 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
406 440
407 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size 442 $self->check_size
409 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
410} 446}
411 447
412sub check_size { 448sub check_size {
413 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
414 450
… …
455 my $class = shift; 491 my $class = shift;
456 492
457 # range [value, low, high, page] 493 # range [value, low, high, page]
458 494
459 $class->SUPER::new ( 495 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
462 @_ 498 @_
463 ) 499 )
464} 500}
465 501
466sub _draw { 502sub _draw {
467 my ($self) = @_; 503 my ($self) = @_;
468 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
470 511
471 glEnable GL_BLEND; 512 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
474 515
475 glBegin GL_QUADS; 516 glBegin GL_QUADS;
476 glVertex 0 , 0; 517 glVertex 0 , 0;
477 glVertex 0 , $h; 518 glVertex 0 , $h;
478 glVertex $w, $h; 519 glVertex $w, $h;
479 glVertex $w, 0; 520 glVertex $w, 0;
480 glEnd; 521 glEnd;
481 522
482 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
483} 525}
484 526
485############################################################################# 527#############################################################################
486 528
487package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
674 716
675 $self->_render; 717 $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 }; 718 };
684} 719}
685 720
686sub _draw { 721sub _draw {
687 my ($self) = @_; 722 my ($self) = @_;
… …
691 my $tex = $self->{texture} 726 my $tex = $self->{texture}
692 or return; 727 or return;
693 728
694 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
697 732
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 734
700 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
701} 736}
… …
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 }, 820 },
786 ; 821 ;
787 822
788 $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 824 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 825 slider => $slider,
791 @_, 826 @_,
792 ); 827 );
793 828
794 $self->{vp}->add ($self->{scrolled}); 829 $self->{vp}->add ($self->{scrolled});
… …
895 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
896 931
897 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
899 934
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901 if $self->{title}; 936 if $self->{title};
902 937
903 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
904} 939}
905 940
… …
1266 1301
1267############################################################################# 1302#############################################################################
1268 1303
1269package CFClient::UI::Label; 1304package CFClient::UI::Label;
1270 1305
1271our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1272 1307
1273use CFClient::OpenGL; 1308use CFClient::OpenGL;
1274 1309
1275sub new { 1310sub new {
1276 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1277 1312
1278 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1280 #font => default_font 1317 #font => default_font
1281 #text => initial text 1318 #text => initial text
1282 #markup => initial narkup 1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1322 layout => (new CFClient::Layout),
1284 fontsize => 1, 1323 fontsize => 1,
1285 align => -1, 1324 align => -1,
1286 valign => -1, 1325 valign => -1,
1287 padding => 2, 1326 padding => 2,
… …
1302 } 1341 }
1303 1342
1304 $self 1343 $self
1305} 1344}
1306 1345
1307sub escape { 1346sub escape($) {
1308 local $_ = $_[1]; 1347 local $_ = $_[0];
1309 1348
1310 s/&/&amp;/g; 1349 s/&/&amp;/g;
1311 s/>/&gt;/g; 1350 s/>/&gt;/g;
1312 s/</&lt;/g; 1351 s/</&lt;/g;
1313 1352
1314 $_[1] 1353 $_
1315} 1354}
1316 1355
1317sub update { 1356sub update {
1318 my ($self) = @_; 1357 my ($self) = @_;
1319 1358
… …
1352sub size_request { 1391sub size_request {
1353 my ($self) = @_; 1392 my ($self) = @_;
1354 1393
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1395 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1399
1359 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1360 1401
1361 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1391} 1432}
1392 1433
1393sub _draw { 1434sub _draw {
1394 my ($self) = @_; 1435 my ($self) = @_;
1395 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1396 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1440 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1442 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1446
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1448
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5; 1451 : ($self->{w} - $tex->{w}) * 0.5);
1407 1452
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5; 1455 : ($self->{h} - $tex->{h}) * 0.5);
1411 1456
1412 $tex 1457 $tex
1413 }; 1458 };
1414 1459
1415 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
… …
1470sub set_text { 1515sub set_text {
1471 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1472 1517
1473 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1519 $self->_set_text ($text);
1520 $self->update;
1475 $self->check_size; 1521 $self->check_size;
1476 $self->update;
1477} 1522}
1478 1523
1479sub get_text { 1524sub get_text {
1480 $_[0]{text} 1525 $_[0]{text}
1481} 1526}
… …
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1567 }
1523 1568
1524 $self->_set_text ($text); 1569 $self->_set_text ($text);
1525 $self->update; 1570 $self->update;
1571 $self->check_size;
1526} 1572}
1527 1573
1528sub focus_in { 1574sub focus_in {
1529 my ($self) = @_; 1575 my ($self) = @_;
1530 1576
… …
1659 my $class = shift; 1705 my $class = shift;
1660 1706
1661 $class->SUPER::new ( 1707 $class->SUPER::new (
1662 padding => 4, 1708 padding => 4,
1663 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1666 can_hover => 1, 1711 can_hover => 1,
1667 align => 0, 1712 align => 0,
1668 valign => 0, 1713 valign => 0,
1669 can_events => 1, 1714 can_events => 1,
… …
1717 1762
1718 $class->SUPER::new ( 1763 $class->SUPER::new (
1719 padding => 2, 1764 padding => 2,
1720 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0], 1766 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5],
1722 state => 0, 1769 state => 0,
1723 can_hover => 1, 1770 can_hover => 1,
1724 @_ 1771 @_
1725 ) 1772 )
1726} 1773}
… …
2018 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2066 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
2024 req_w => $::WIDTH / 80, 2073 req_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2074 req_h => $::WIDTH / 80,
2026 vertical => 0, 2075 vertical => 0,
2027 can_hover => 1, 2076 can_hover => 1,
2028 inner_pad => .05, 2077 inner_pad => 0.02,
2029 @_ 2078 @_
2030 ); 2079 );
2031 2080
2032 $self->set_value ($self->{range}[0]); 2081 $self->set_value ($self->{range}[0]);
2033 $self->update; 2082 $self->update;
… …
2123 glScale $self->{w}, $self->{h}; 2172 glScale $self->{w}, $self->{h};
2124 2173
2125 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
2127 2176
2177 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2179 }
2131 2180
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2183
… …
2180 2229
2181 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
2182 $self->reflow; 2231 $self->reflow;
2183} 2232}
2184 2233
2234sub size_allocate {
2235 my ($self, $w, $h) = @_;
2236
2237 $self->SUPER::size_allocate ($w, $h);
2238
2239 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $self->{layout}->set_width ($self->{children}[0]{w});
2242
2243 $self->reflow;
2244}
2245
2185sub text_height { 2246sub text_height {
2186 my ($self, $text) = @_; 2247 my ($self, $text, $indent) = @_;
2187 2248
2188 my $layout = $self->{layout}; 2249 my $layout = $self->{layout};
2189 2250
2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191 $layout->set_width ($self->{children}[0]{w}); 2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2192 $layout->set_markup ($text); 2253 $layout->set_markup ($text);
2193 2254
2194 ($layout->size)[1] 2255 ($layout->size)[1]
2195} 2256}
2196 2257
… …
2199 2260
2200 $self->{need_reflow}++; 2261 $self->{need_reflow}++;
2201 $self->update; 2262 $self->update;
2202} 2263}
2203 2264
2204sub size_allocate {
2205 my ($self, $w, $h) = @_;
2206
2207 $self->SUPER::size_allocate ($w, $h);
2208
2209 $self->{layout}->set_font ($self->{font}) if $self->{font};
2210 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2211 $self->{layout}->set_width ($self->{children}[0]{w});
2212
2213 $self->reflow;
2214}
2215
2216sub add_paragraph { 2265sub add_paragraph {
2217 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2218 2267
2219 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2220 2269
2270 for my $line (split /\n/, $text) {
2221 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2222
2223 $self->{height} += $height; 2272 $self->{height} += $height;
2224
2225 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2226 2275
2227 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2228 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2229} 2278}
2230 2279
… …
2239 2288
2240 $ROOT->on_post_alloc ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2241 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2242 my $height = 0; 2291 my $height = 0;
2243 2292
2244 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2245 for @{$self->{par}}; 2294 for @{$self->{par}};
2246 2295
2247 $self->{height} = $height; 2296 $self->{height} = $height;
2248 2297
2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2299 $self->{children}[1]->update;
2250 2300
2251 delete $self->{texture}; 2301 delete $self->{texture};
2252 } 2302 }
2253 2303
2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2255 glClearColor 0, 0, 0, 0; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2257
2258 glEnable GL_TEXTURE_2D;
2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260 2307
2261 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2262 2309
2263 my $y0 = $top; 2310 my $y0 = $top;
2264 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2267 2314
2268 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2269 2316
2270 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2271 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2272 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2273 my $h = $par->[0]; 2323 my $h = $par->[0];
2274 2324
2275 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] }); 2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2277 $layout->set_markup ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2278 2329
2279 my ($W, $H) = $layout->size; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2331
2332 glRasterPos $par->[2], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2281 } 2334 }
2282 2335
2283 $y += $h; 2336 $y += $h;
2284 } 2337 }
2285 2338
2286 glDisable GL_TEXTURE_2D; 2339 glDisable GL_BLEND;
2287 }; 2340 };
2288 }); 2341 });
2289} 2342}
2290 2343
2291sub _draw { 2344sub _draw {
2292 my ($self) = @_; 2345 my ($self) = @_;
2293 2346
2294 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2349 glColor 1, 1, 1, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2299 2352
2300 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2301 2354
2302} 2355}
… …
2401 2454
2402sub set_tooltip_from { 2455sub set_tooltip_from {
2403 my ($self, $widget) = @_; 2456 my ($self, $widget) = @_;
2404 2457
2405 $self->add (new CFClient::UI::Label 2458 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip}, 2459 markup => $widget->{tooltip},
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 2461 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 2465 );
2412} 2466}
2413 2467
2414sub size_request { 2468sub size_request {
2415 my ($self) = @_; 2469 my ($self) = @_;
… …
2461use CFClient::OpenGL; 2515use CFClient::OpenGL;
2462 2516
2463sub new { 2517sub new {
2464 my $class = shift; 2518 my $class = shift;
2465 2519
2466 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2467 aspect => 1, 2521 aspect => 1,
2468 @_, 2522 @_,
2469 ) 2523 );
2524
2525 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self);
2527
2528 $self->{timer} = Event->timer (
2529 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2530 hard => 1,
2531 interval => $self->{animspeed},
2532 cb => sub {
2533 ++$widget->{frame};
2534 $widget->update;
2535 },
2536 );
2537 }
2538
2539 $self
2470} 2540}
2471 2541
2472sub size_request { 2542sub size_request {
2473 (32, 8) 2543 (32, 8)
2474} 2544}
2475 2545
2546sub update {
2547 my ($self) = @_;
2548
2549 return unless $self->{visible};
2550
2551 $self->SUPER::update;
2552}
2553
2476sub _draw { 2554sub _draw {
2477 my ($self) = @_; 2555 my ($self) = @_;
2478 2556
2479 return unless $::CONN;#d# manage and cache textures differently 2557 return unless $::CONN;#d# manage and cache textures differently
2558
2559 my $face;
2560
2561 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}];
2563
2564 $face = $anim->[ $self->{frame} % @$anim ]
2565 if $anim && @$anim;
2566 }
2567
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481 2569
2482 # TODO animation
2483 if ($tex) { 2570 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 2571 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 2573 glColor 1, 1, 1, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 2575 glDisable GL_TEXTURE_2D;
2489 } 2576 }
2490} 2577}
2491 2578
2579sub DESTROY {
2580 my ($self) = @_;
2581
2582 $self->{timer}->cancel
2583 if $self->{timer};
2584
2585 $self->SUPER::DESTROY;
2586}
2587
2492############################################################################# 2588#############################################################################
2493 2589
2494package CFClient::UI::InventoryItem; 2590package CFClient::UI::InventoryItem;
2495 2591
2496our @ISA = CFClient::UI::HBox::; 2592our @ISA = CFClient::UI::HBox::;
2497 2593
2498sub new { 2594sub _item_to_desc {
2499 my $class = shift; 2595 my ($item) = @_;
2500 2596
2501 my %args = @_; 2597 my $desc =
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2 2598 $item->{nrof} < 2
2506 ? $item->{name} 2599 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}"; 2600 : "$item->{nrof} × $item->{name_pl}";
2508 2601
2509 $item->{flags} & Crossfire::Protocol::F_OPEN 2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)"; 2603 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED 2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)"; 2605 and $desc .= " (applied)";
… …
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED 2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)"; 2613 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED 2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *"; 2615 and $desc .= " *";
2523 2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2524 my $self = $class->SUPER::new ( 2629 my $self = $class->SUPER::new (
2525 can_hover => 1, 2630 can_hover => 1,
2526 can_events => 1, 2631 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc) 2632 tooltip => ((CFClient::UI::Label::escape $desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub { 2634 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2531 2636
2532 # todo: maybe put examine on 1? but should just be a tooltip :( 2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2533 if ($ev->{button} == 1) { 2646 } elsif ($ev->{button} == 1) {
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2647 $::CONN->send ("examine $item->{tag}");
2535 } elsif ($ev->{button} == 2) { 2648 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}"); 2649 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) { 2650 } elsif ($ev->{button} == 3) {
2538 my @menu_items = ( 2651 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [ 2663 )
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ], 2664 ),
2547 ); 2665 );
2548 2666
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 } 2668 }
2551 2669
2552 1 2670 1
2553 }, 2671 },
2554 %args 2672 %args
2555 ); 2673 );
2674
2556 2675
2557 $self->add (new CFClient::UI::Face 2676 $self->add (new CFClient::UI::Face
2558 can_events => 0, 2677 can_events => 0,
2559 face => $item->{face}, 2678 face => $item->{face},
2560 anim => $item->{anim}, 2679 anim => $item->{anim},
2561 animspeed => $item->{animspeed}, 2680 animspeed => $item->{animspeed},
2562 ); 2681 );
2563 2682
2564 $self->add (new CFClient::UI::Label 2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2565 can_events => 0, 2684
2566 text => $desc, 2685 $self->{item} = $item;
2567 ); 2686
2687 $self->update_item;
2568 2688
2569 $self 2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2570} 2698}
2571 2699
2572############################################################################# 2700#############################################################################
2573 2701
2574package CFClient::UI::Inventory; 2702package CFClient::UI::Inventory;
… …
2577 2705
2578sub new { 2706sub new {
2579 my $class = shift; 2707 my $class = shift;
2580 2708
2581 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
2582 scrolled => (new CFClient::UI::VBox), 2710 scrolled => (new CFClient::UI::Table),
2583 @_, 2711 @_,
2584 ); 2712 );
2585 2713
2586 $self 2714 $self
2587} 2715}
… …
2598 } @$items; 2726 } @$items;
2599 2727
2600 $self->{real_items} = \@items; 2728 $self->{real_items} = \@items;
2601 2729
2602 for my $item (@items) { 2730 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2 2731 $item->{item} = $item;
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2608 } 2734 }
2609 2735
2736 my $i = 0;
2737 for (@items) {
2610 $self->{scrolled}->add (@items); 2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2611 2742
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613} 2744}
2614 2745
2615sub size_request { 2746sub size_request {
… …
2693 2824
2694package CFClient::UI::Statusbox; 2825package CFClient::UI::Statusbox;
2695 2826
2696our @ISA = CFClient::UI::VBox::; 2827our @ISA = CFClient::UI::VBox::;
2697 2828
2829sub new {
2830 my $class = shift;
2831
2832 $class->SUPER::new (
2833 fontsize => 0.8,
2834 @_,
2835 )
2836}
2837
2698sub reorder { 2838sub reorder {
2699 my ($self) = @_; 2839 my ($self) = @_;
2700 my $NOW = time; 2840 my $NOW = time;
2701 2841
2702 while (my ($k, $v) = each %{ $self->{item} }) { 2842 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2721 : $item->{text}; 2861 : $item->{text};
2722 2862
2723 for ($short) { 2863 for ($short) {
2724 s/^\s+//; 2864 s/^\s+//;
2725 s/\s+/ /g; 2865 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 } 2866 }
2729 2867
2730 new CFClient::UI::Label 2868 new CFClient::UI::Label
2731 markup => $short, 2869 markup => $short,
2732 tooltip => $item->{tooltip}, 2870 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP, 2871 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67, 2872 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize}, 2873 fontsize => $item->{fontsize} || $self->{fontsize},
2874 max_w => $::WIDTH * 0.44,
2736 fg => $item->{fg}, 2875 fg => $item->{fg},
2737 can_events => 1, 2876 can_events => 1,
2738 can_hover => 1 2877 can_hover => 1
2739 }; 2878 };
2740 } 2879 }
… …
2767 $self->{item}{$group} = { 2906 $self->{item}{$group} = {
2768 id => ++$self->{id}, 2907 id => ++$self->{id},
2769 text => $text, 2908 text => $text,
2770 timeout => $timeout, 2909 timeout => $timeout,
2771 tooltip => $text, 2910 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8], 2911 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0, 2912 pri => 0,
2775 count => 1, 2913 count => 1,
2776 %arg, 2914 %arg,
2777 }; 2915 };
2778 } 2916 }
2779 2917
2780 $self->reorder; 2918 $self->reorder;
2781} 2919}
2782 2920
2921sub reconfigure {
2922 my ($self) = @_;
2923
2924 delete $_->{label}
2925 for values %{ $self->{item} || {} };
2926
2927 $self->reorder;
2928 $self->SUPER::reconfigure;
2929}
2930
2783############################################################################# 2931#############################################################################
2784 2932
2785package CFClient::UI::Root; 2933package CFClient::UI::Root;
2786 2934
2787our @ISA = CFClient::UI::Container::; 2935our @ISA = CFClient::UI::Container::;
… …
2870 $child->{x} = int $child->{x}; 3018 $child->{x} = int $child->{x};
2871 $child->{y} = int $child->{y}; 3019 $child->{y} = int $child->{y};
2872 } 3020 }
2873 3021
2874 $self->SUPER::add (@children); 3022 $self->SUPER::add (@children);
3023
3024 while (@children) {
3025 my $w = pop @children;
3026 push @children, $w->children;
3027 $w->{visible} = 1;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 }
2875} 3041}
2876 3042
2877sub on_refresh { 3043sub on_refresh {
2878 my ($self, $id, $cb) = @_; 3044 my ($self, $id, $cb) = @_;
2879 3045
… …
2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949 glClear GL_COLOR_BUFFER_BIT; 3115 glClear GL_COLOR_BUFFER_BIT;
2950 3116
2951 glMatrixMode GL_PROJECTION; 3117 glMatrixMode GL_PROJECTION;
2952 glLoadIdentity; 3118 glLoadIdentity;
2953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954 glMatrixMode GL_MODELVIEW; 3120 glMatrixMode GL_MODELVIEW;
2955 glLoadIdentity; 3121 glLoadIdentity;
2956 3122
2957 $self->_draw; 3123 $self->_draw;
2958} 3124}
… …
2960############################################################################# 3126#############################################################################
2961 3127
2962package CFClient::UI; 3128package CFClient::UI;
2963 3129
2964$ROOT = new CFClient::UI::Root; 3130$ROOT = new CFClient::UI::Root;
2965$TOOLTIP = new CFClient::UI::Tooltip; 3131$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2966 3132
29671 31331
2968 3134

Diff Legend

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