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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.226 by root, Tue May 23 23:14:46 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}
… …
708 743
709sub size_request { 744sub size_request {
710 my ($self) = @_; 745 my ($self) = @_;
711 746
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 748
715 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
716} 750}
717 751
718sub size_allocate { 752sub size_allocate {
719 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
720 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
721 $self->update; 758 $self->update;
722} 759}
723 760
724sub set_offset { 761sub set_offset {
725 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 }, 822 },
786 ; 823 ;
787 824
788 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 827 slider => $slider,
791 @_, 828 @_,
792 ); 829 );
793 830
794 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
1266 1303
1267############################################################################# 1304#############################################################################
1268 1305
1269package CFClient::UI::Label; 1306package CFClient::UI::Label;
1270 1307
1271our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1272 1309
1273use CFClient::OpenGL; 1310use CFClient::OpenGL;
1274 1311
1275sub new { 1312sub new {
1276 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1277 1314
1278 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1280 #font => default_font 1319 #font => default_font
1281 #text => initial text 1320 #text => initial text
1282 #markup => initial narkup 1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1324 layout => (new CFClient::Layout),
1284 fontsize => 1, 1325 fontsize => 1,
1285 align => -1, 1326 align => -1,
1286 valign => -1, 1327 valign => -1,
1287 padding => 2, 1328 padding => 2,
… …
1302 } 1343 }
1303 1344
1304 $self 1345 $self
1305} 1346}
1306 1347
1307sub escape { 1348sub escape($) {
1308 local $_ = $_[1]; 1349 local $_ = $_[0];
1309 1350
1310 s/&/&amp;/g; 1351 s/&/&amp;/g;
1311 s/>/&gt;/g; 1352 s/>/&gt;/g;
1312 s/</&lt;/g; 1353 s/</&lt;/g;
1313 1354
1314 $_[1] 1355 $_
1315} 1356}
1316 1357
1317sub update { 1358sub update {
1318 my ($self) = @_; 1359 my ($self) = @_;
1319 1360
… …
1352sub size_request { 1393sub size_request {
1353 my ($self) = @_; 1394 my ($self) = @_;
1354 1395
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1401
1359 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1360 1403
1361 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1391} 1434}
1392 1435
1393sub _draw { 1436sub _draw {
1394 my ($self) = @_; 1437 my ($self) = @_;
1395 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1396 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1442 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1448
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1450
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1443 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1444 can_hover => 1, 1491 can_hover => 1,
1445 can_focus => 1, 1492 can_focus => 1,
1446 valign => 0, 1493 valign => 0,
1447 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1448 @_ 1496 @_
1449 ) 1497 )
1450} 1498}
1451 1499
1452sub _set_text { 1500sub _set_text {
… …
1660 my $class = shift; 1708 my $class = shift;
1661 1709
1662 $class->SUPER::new ( 1710 $class->SUPER::new (
1663 padding => 4, 1711 padding => 4,
1664 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1667 can_hover => 1, 1714 can_hover => 1,
1668 align => 0, 1715 align => 0,
1669 valign => 0, 1716 valign => 0,
1670 can_events => 1, 1717 can_events => 1,
… …
1718 1765
1719 $class->SUPER::new ( 1766 $class->SUPER::new (
1720 padding => 2, 1767 padding => 2,
1721 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1769 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1772 state => 0,
1724 can_hover => 1, 1773 can_hover => 1,
1725 @_ 1774 @_
1726 ) 1775 )
1727} 1776}
… …
2019 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2069 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
2025 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2027 vertical => 0, 2078 vertical => 0,
2028 can_hover => 1, 2079 can_hover => 1,
2029 inner_pad => .05, 2080 inner_pad => 0.02,
2030 @_ 2081 @_
2031 ); 2082 );
2032 2083
2033 $self->set_value ($self->{range}[0]); 2084 $self->set_value ($self->{range}[0]);
2034 $self->update; 2085 $self->update;
2035 2086
2036 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2037} 2096}
2038 2097
2039sub set_value { 2098sub set_value {
2040 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2041 2100
… …
2124 glScale $self->{w}, $self->{h}; 2183 glScale $self->{w}, $self->{h};
2125 2184
2126 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2127 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2128 2187
2188 glTranslate 1, 0, 0;
2129 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2130 glTranslate 0, 1, 0;
2131 } 2190 }
2132 2191
2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135 2194
… …
2142 # draw handle 2201 # draw handle
2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2203
2145 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2146} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2147 2247
2148############################################################################# 2248#############################################################################
2149 2249
2150package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2151 2251
… …
2181 2281
2182 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2183 $self->reflow; 2283 $self->reflow;
2184} 2284}
2185 2285
2286sub size_allocate {
2287 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290
2291 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294
2295 $self->reflow;
2296}
2297
2186sub text_height { 2298sub text_height {
2187 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2188 2300
2189 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2190 2302
2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2193 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2194 2306
2195 ($layout->size)[1] 2307 ($layout->size)[1]
2196} 2308}
2197 2309
… …
2200 2312
2201 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2202 $self->update; 2314 $self->update;
2203} 2315}
2204 2316
2205sub size_allocate { 2317sub clear {
2206 my ($self, $w, $h) = @_; 2318 my ($self) = @_;
2207 2319
2208 $self->SUPER::size_allocate ($w, $h); 2320 $self->{par} = [];
2209 2321 $self->{height} = 0;
2210 $self->{layout}->set_font ($self->{font}) if $self->{font};
2211 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2212 $self->{layout}->set_width ($self->{children}[0]{w});
2213 2322
2214 $self->reflow; 2323 $self->reflow;
2215} 2324}
2216 2325
2217sub add_paragraph { 2326sub add_paragraph {
2218 my ($self, $color, $text) = @_; 2327 my ($self, $color, $text, $indent) = @_;
2219 2328
2220 #TODO: intelligently "reformat" paragraph 2329 for my $line (split /\n/, $text) {
2221
2222 my $height = $self->text_height ($text); 2330 my $height = $self->text_height ($line);
2223
2224 $self->{height} += $height; 2331 $self->{height} += $height;
2225
2226 push @{$self->{par}}, [$height, $color, $text]; 2332 push @{$self->{par}}, [$height, $color, $indent, $line];
2333 }
2227 2334
2228 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2229 $self->{children}[1]->update; 2336 $self->{children}[1]->update;
2230} 2337}
2231 2338
… …
2240 2347
2241 $ROOT->on_post_alloc ($self, sub { 2348 $ROOT->on_post_alloc ($self, sub {
2242 if (delete $self->{need_reflow}) { 2349 if (delete $self->{need_reflow}) {
2243 my $height = 0; 2350 my $height = 0;
2244 2351
2245 $height += $_->[0] = $self->text_height ($_->[2]) 2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2246 for @{$self->{par}}; 2353 for @{$self->{par}};
2247 2354
2248 $self->{height} = $height; 2355 $self->{height} = $height;
2249 2356
2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2358 $self->{children}[1]->update;
2251 2359
2252 delete $self->{texture}; 2360 delete $self->{texture};
2253 } 2361 }
2254 2362
2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2256 glClearColor 0, 0, 0, 0; 2364 glClearColor 0.5, 0.5, 0.5, 0;
2257 glClear GL_COLOR_BUFFER_BIT; 2365 glClear GL_COLOR_BUFFER_BIT;
2258
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261 2366
2262 my $top = int $self->{children}[1]{range}[0]; 2367 my $top = int $self->{children}[1]{range}[0];
2263 2368
2264 my $y0 = $top; 2369 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2370 my $y1 = $top + $self->{h};
… …
2268 2373
2269 my $layout = $self->{layout}; 2374 my $layout = $self->{layout};
2270 2375
2271 $layout->set_font ($self->{font}) if $self->{font}; 2376 $layout->set_font ($self->{font}) if $self->{font};
2272 2377
2378 glEnable GL_BLEND;
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380
2273 for my $par (@{$self->{par}}) { 2381 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2382 my $h = $par->[0];
2275 2383
2276 if ($y0 < $y + $h && $y < $y1) { 2384 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] }); 2385 $layout->set_foreground (@{ $par->[1] });
2386 $layout->set_width ($self->{w} - $par->[2]);
2278 $layout->set_markup ($par->[2]); 2387 $layout->set_markup ($par->[3]);
2279 2388
2280 my ($W, $H) = $layout->size; 2389 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2390
2391 glRasterPos $par->[2], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2393 }
2283 2394
2284 $y += $h; 2395 $y += $h;
2285 } 2396 }
2286 2397
2287 glDisable GL_TEXTURE_2D; 2398 glDisable GL_BLEND;
2288 }; 2399 };
2289 }); 2400 });
2290} 2401}
2291 2402
2292sub _draw { 2403sub _draw {
2293 my ($self) = @_; 2404 my ($self) = @_;
2294 2405
2295 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297 glColor 1, 1, 1, 1; 2408 glColor 1, 1, 1, 1;
2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2409 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2299 glDisable GL_TEXTURE_2D; 2410 glDisable GL_TEXTURE_2D;
2300 2411
2301 $self->{children}[1]->draw; 2412 $self->{children}[1]->draw;
2302 2413
2303} 2414}
… …
2402 2513
2403sub set_tooltip_from { 2514sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2515 my ($self, $widget) = @_;
2405 2516
2406 $self->add (new CFClient::UI::Label 2517 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2518 markup => $widget->{tooltip},
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2519 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2520 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2521 fg => [0, 0, 0, 1],
2522 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2523 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2524 );
2413} 2525}
2414 2526
2415sub size_request { 2527sub size_request {
2416 my ($self) = @_; 2528 my ($self) = @_;
… …
2462use CFClient::OpenGL; 2574use CFClient::OpenGL;
2463 2575
2464sub new { 2576sub new {
2465 my $class = shift; 2577 my $class = shift;
2466 2578
2467 $class->SUPER::new ( 2579 my $self = $class->SUPER::new (
2468 aspect => 1, 2580 aspect => 1,
2469 @_, 2581 @_,
2470 ) 2582 );
2583
2584 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self);
2586
2587 $self->{timer} = Event->timer (
2588 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2589 hard => 1,
2590 interval => $self->{animspeed},
2591 cb => sub {
2592 ++$widget->{frame};
2593 $widget->update;
2594 },
2595 );
2596 }
2597
2598 $self
2471} 2599}
2472 2600
2473sub size_request { 2601sub size_request {
2474 (32, 8) 2602 (32, 8)
2475} 2603}
2476 2604
2605sub update {
2606 my ($self) = @_;
2607
2608 return unless $self->{visible};
2609
2610 $self->SUPER::update;
2611}
2612
2477sub _draw { 2613sub _draw {
2478 my ($self) = @_; 2614 my ($self) = @_;
2479 2615
2480 return unless $::CONN;#d# manage and cache textures differently 2616 return unless $::CONN;#d# manage and cache textures differently
2617
2618 my $face;
2619
2620 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}];
2622
2623 $face = $anim->[ $self->{frame} % @$anim ]
2624 if $anim && @$anim;
2625 }
2626
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2627 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482 2628
2483 # TODO animation
2484 if ($tex) { 2629 if ($tex) {
2485 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2632 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2633 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2490 } 2635 }
2491} 2636}
2492 2637
2638sub DESTROY {
2639 my ($self) = @_;
2640
2641 $self->{timer}->cancel
2642 if $self->{timer};
2643
2644 $self->SUPER::DESTROY;
2645}
2646
2493############################################################################# 2647#############################################################################
2494 2648
2495package CFClient::UI::InventoryItem; 2649package CFClient::UI::InventoryItem;
2496 2650
2497our @ISA = CFClient::UI::HBox::; 2651our @ISA = CFClient::UI::HBox::;
2498 2652
2499sub new { 2653sub _item_to_desc {
2500 my $class = shift; 2654 my ($item) = @_;
2501 2655
2502 my %args = @_; 2656 my $desc =
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2 2657 $item->{nrof} < 2
2507 ? $item->{name} 2658 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}"; 2659 : "$item->{nrof} × $item->{name_pl}";
2509 2660
2510 $item->{flags} & Crossfire::Protocol::F_OPEN 2661 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)"; 2662 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED 2663 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)"; 2664 and $desc .= " (applied)";
… …
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED 2671 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)"; 2672 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED 2673 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *"; 2674 and $desc .= " *";
2524 2675
2676 $desc
2677}
2678
2679sub new {
2680 my $class = shift;
2681
2682 my %args = @_;
2683
2684 my $item = delete $args{item};
2685
2686 my $desc = _item_to_desc ($item);
2687
2525 my $self = $class->SUPER::new ( 2688 my $self = $class->SUPER::new (
2526 can_hover => 1, 2689 can_hover => 1,
2527 can_events => 1, 2690 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc) 2691 tooltip => ((CFClient::UI::Label::escape $desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub { 2693 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_; 2694 my ($self, $ev, $x, $y) = @_;
2532 2695
2533 # todo: maybe put examine on 1? but should just be a tooltip :( 2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2698 my $targ = $::CONN->{player}{tag};
2699
2700 if ($item->{container} == $::CONN->{player}{tag}) {
2701 $targ = $main::OPENCONT;
2702 }
2703
2704 $::CONN->send ("move $targ $item->{tag} 0");
2534 if ($ev->{button} == 1) { 2705 } elsif ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2706 $::CONN->send ("examine $item->{tag}");
2536 } elsif ($ev->{button} == 2) { 2707 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}"); 2708 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) { 2709 } elsif ($ev->{button} == 3) {
2539 my @menu_items = ( 2710 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2712 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2713 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714 (
2715 $item->{flags} & Crossfire::Protocol::F_LOCKED
2716 ? (
2717 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718 )
2719 : (
2720 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2721 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [ 2722 )
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ], 2723 ),
2548 ); 2724 );
2549 2725
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2726 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 } 2727 }
2552 2728
2553 1 2729 1
2554 }, 2730 },
2555 %args 2731 %args
2556 ); 2732 );
2733
2557 2734
2558 $self->add (new CFClient::UI::Face 2735 $self->add (new CFClient::UI::Face
2559 can_events => 0, 2736 can_events => 0,
2560 face => $item->{face}, 2737 face => $item->{face},
2561 anim => $item->{anim}, 2738 anim => $item->{anim},
2562 animspeed => $item->{animspeed}, 2739 animspeed => $item->{animspeed},
2563 ); 2740 );
2564 2741
2565 $self->add (new CFClient::UI::Label 2742 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2566 can_events => 0, 2743
2567 text => $desc, 2744 $self->{item} = $item;
2568 ); 2745
2746 $self->update_item;
2569 2747
2570 $self 2748 $self
2749}
2750
2751sub update_item {
2752 my ($self) = @_;
2753
2754 my $desc = _item_to_desc ($self->{item});
2755
2756 $self->{name_lbl}->set_text ($desc);
2571} 2757}
2572 2758
2573############################################################################# 2759#############################################################################
2574 2760
2575package CFClient::UI::Inventory; 2761package CFClient::UI::Inventory;
… …
2578 2764
2579sub new { 2765sub new {
2580 my $class = shift; 2766 my $class = shift;
2581 2767
2582 my $self = $class->SUPER::new ( 2768 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox), 2769 scrolled => (new CFClient::UI::Table),
2584 @_, 2770 @_,
2585 ); 2771 );
2586 2772
2587 $self 2773 $self
2588} 2774}
… …
2599 } @$items; 2785 } @$items;
2600 2786
2601 $self->{real_items} = \@items; 2787 $self->{real_items} = \@items;
2602 2788
2603 for my $item (@items) { 2789 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2 2790 $item->{item} = $item;
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792 $item->update_item ();
2609 } 2793 }
2610 2794
2795 my $i = 0;
2796 for (@items) {
2611 $self->{scrolled}->add (@items); 2797 $self->{scrolled}->add (0, $i, $_);
2798 my $nrof = $_->{item}->{nrof} || 1;
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800 }
2612 2801
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614} 2803}
2615 2804
2616sub size_request { 2805sub size_request {
… …
2694 2883
2695package CFClient::UI::Statusbox; 2884package CFClient::UI::Statusbox;
2696 2885
2697our @ISA = CFClient::UI::VBox::; 2886our @ISA = CFClient::UI::VBox::;
2698 2887
2888sub new {
2889 my $class = shift;
2890
2891 $class->SUPER::new (
2892 fontsize => 0.8,
2893 @_,
2894 )
2895}
2896
2699sub reorder { 2897sub reorder {
2700 my ($self) = @_; 2898 my ($self) = @_;
2701 my $NOW = time; 2899 my $NOW = time;
2702 2900
2703 while (my ($k, $v) = each %{ $self->{item} }) { 2901 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2722 : $item->{text}; 2920 : $item->{text};
2723 2921
2724 for ($short) { 2922 for ($short) {
2725 s/^\s+//; 2923 s/^\s+//;
2726 s/\s+/ /g; 2924 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 2925 }
2730 2926
2731 new CFClient::UI::Label 2927 new CFClient::UI::Label
2732 markup => $short, 2928 markup => $short,
2733 tooltip => $item->{tooltip}, 2929 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 2930 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 2931 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 2932 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 2934 fg => $item->{fg},
2738 can_events => 1, 2935 can_events => 1,
2739 can_hover => 1 2936 can_hover => 1
2740 }; 2937 };
2741 } 2938 }
… …
2768 $self->{item}{$group} = { 2965 $self->{item}{$group} = {
2769 id => ++$self->{id}, 2966 id => ++$self->{id},
2770 text => $text, 2967 text => $text,
2771 timeout => $timeout, 2968 timeout => $timeout,
2772 tooltip => $text, 2969 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 2970 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 2971 pri => 0,
2776 count => 1, 2972 count => 1,
2777 %arg, 2973 %arg,
2778 }; 2974 };
2779 } 2975 }
2780 2976
2781 $self->reorder; 2977 $self->reorder;
2782} 2978}
2783 2979
2980sub reconfigure {
2981 my ($self) = @_;
2982
2983 delete $_->{label}
2984 for values %{ $self->{item} || {} };
2985
2986 $self->reorder;
2987 $self->SUPER::reconfigure;
2988}
2989
2784############################################################################# 2990#############################################################################
2785 2991
2786package CFClient::UI::Root; 2992package CFClient::UI::Root;
2787 2993
2788our @ISA = CFClient::UI::Container::; 2994our @ISA = CFClient::UI::Container::;
… …
2871 $child->{x} = int $child->{x}; 3077 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y}; 3078 $child->{y} = int $child->{y};
2873 } 3079 }
2874 3080
2875 $self->SUPER::add (@children); 3081 $self->SUPER::add (@children);
3082
3083 while (@children) {
3084 my $w = pop @children;
3085 push @children, $w->children;
3086 $w->{visible} = 1;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 }
2876} 3100}
2877 3101
2878sub on_refresh { 3102sub on_refresh {
2879 my ($self, $id, $cb) = @_; 3103 my ($self, $id, $cb) = @_;
2880 3104
… …
2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3173 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2951 3175
2952 glMatrixMode GL_PROJECTION; 3176 glMatrixMode GL_PROJECTION;
2953 glLoadIdentity; 3177 glLoadIdentity;
2954 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3178 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955 glMatrixMode GL_MODELVIEW; 3179 glMatrixMode GL_MODELVIEW;
2956 glLoadIdentity; 3180 glLoadIdentity;
2957 3181
2958 $self->_draw; 3182 $self->_draw;
2959} 3183}
… …
2961############################################################################# 3185#############################################################################
2962 3186
2963package CFClient::UI; 3187package CFClient::UI;
2964 3188
2965$ROOT = new CFClient::UI::Root; 3189$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3190$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3191
29681 31921
2969 3193

Diff Legend

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