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.225 by root, Tue May 23 21:14:41 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 {
2206 my ($self, $w, $h) = @_;
2207
2208 $self->SUPER::size_allocate ($w, $h);
2209
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
2214 $self->reflow;
2215}
2216
2217sub add_paragraph { 2317sub add_paragraph {
2218 my ($self, $color, $text) = @_; 2318 my ($self, $color, $text, $indent) = @_;
2219 2319
2220 #TODO: intelligently "reformat" paragraph 2320 #TODO: intelligently "reformat" paragraph
2221 2321
2322 for my $line (split /\n/, $text) {
2222 my $height = $self->text_height ($text); 2323 my $height = $self->text_height ($line);
2223
2224 $self->{height} += $height; 2324 $self->{height} += $height;
2225
2226 push @{$self->{par}}, [$height, $color, $text]; 2325 push @{$self->{par}}, [$height, $color, $indent, $line];
2326 }
2227 2327
2228 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2229 $self->{children}[1]->update; 2329 $self->{children}[1]->update;
2230} 2330}
2231 2331
… …
2240 2340
2241 $ROOT->on_post_alloc ($self, sub { 2341 $ROOT->on_post_alloc ($self, sub {
2242 if (delete $self->{need_reflow}) { 2342 if (delete $self->{need_reflow}) {
2243 my $height = 0; 2343 my $height = 0;
2244 2344
2245 $height += $_->[0] = $self->text_height ($_->[2]) 2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2246 for @{$self->{par}}; 2346 for @{$self->{par}};
2247 2347
2248 $self->{height} = $height; 2348 $self->{height} = $height;
2249 2349
2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2351 $self->{children}[1]->update;
2251 2352
2252 delete $self->{texture}; 2353 delete $self->{texture};
2253 } 2354 }
2254 2355
2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2256 glClearColor 0, 0, 0, 0; 2357 glClearColor 0.5, 0.5, 0.5, 0;
2257 glClear GL_COLOR_BUFFER_BIT; 2358 glClear GL_COLOR_BUFFER_BIT;
2258
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261 2359
2262 my $top = int $self->{children}[1]{range}[0]; 2360 my $top = int $self->{children}[1]{range}[0];
2263 2361
2264 my $y0 = $top; 2362 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2363 my $y1 = $top + $self->{h};
… …
2268 2366
2269 my $layout = $self->{layout}; 2367 my $layout = $self->{layout};
2270 2368
2271 $layout->set_font ($self->{font}) if $self->{font}; 2369 $layout->set_font ($self->{font}) if $self->{font};
2272 2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2273 for my $par (@{$self->{par}}) { 2374 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2375 my $h = $par->[0];
2275 2376
2276 if ($y0 < $y + $h && $y < $y1) { 2377 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] }); 2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2278 $layout->set_markup ($par->[2]); 2380 $layout->set_markup ($par->[3]);
2279 2381
2280 my ($W, $H) = $layout->size; 2382 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2383
2384 glRasterPos $par->[2], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2386 }
2283 2387
2284 $y += $h; 2388 $y += $h;
2285 } 2389 }
2286 2390
2287 glDisable GL_TEXTURE_2D; 2391 glDisable GL_BLEND;
2288 }; 2392 };
2289 }); 2393 });
2290} 2394}
2291 2395
2292sub _draw { 2396sub _draw {
2293 my ($self) = @_; 2397 my ($self) = @_;
2294 2398
2295 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297 glColor 1, 1, 1, 1; 2401 glColor 1, 1, 1, 1;
2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2402 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2299 glDisable GL_TEXTURE_2D; 2403 glDisable GL_TEXTURE_2D;
2300 2404
2301 $self->{children}[1]->draw; 2405 $self->{children}[1]->draw;
2302 2406
2303} 2407}
… …
2402 2506
2403sub set_tooltip_from { 2507sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2508 my ($self, $widget) = @_;
2405 2509
2406 $self->add (new CFClient::UI::Label 2510 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2511 markup => $widget->{tooltip},
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2513 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2514 fg => [0, 0, 0, 1],
2515 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2516 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2517 );
2413} 2518}
2414 2519
2415sub size_request { 2520sub size_request {
2416 my ($self) = @_; 2521 my ($self) = @_;
… …
2462use CFClient::OpenGL; 2567use CFClient::OpenGL;
2463 2568
2464sub new { 2569sub new {
2465 my $class = shift; 2570 my $class = shift;
2466 2571
2467 $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2468 aspect => 1, 2573 aspect => 1,
2469 @_, 2574 @_,
2470 ) 2575 );
2576
2577 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self);
2579
2580 $self->{timer} = Event->timer (
2581 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2582 hard => 1,
2583 interval => $self->{animspeed},
2584 cb => sub {
2585 ++$widget->{frame};
2586 $widget->update;
2587 },
2588 );
2589 }
2590
2591 $self
2471} 2592}
2472 2593
2473sub size_request { 2594sub size_request {
2474 (32, 8) 2595 (32, 8)
2475} 2596}
2476 2597
2598sub update {
2599 my ($self) = @_;
2600
2601 return unless $self->{visible};
2602
2603 $self->SUPER::update;
2604}
2605
2477sub _draw { 2606sub _draw {
2478 my ($self) = @_; 2607 my ($self) = @_;
2479 2608
2480 return unless $::CONN;#d# manage and cache textures differently 2609 return unless $::CONN;#d# manage and cache textures differently
2610
2611 my $face;
2612
2613 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}];
2615
2616 $face = $anim->[ $self->{frame} % @$anim ]
2617 if $anim && @$anim;
2618 }
2619
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482 2621
2483 # TODO animation
2484 if ($tex) { 2622 if ($tex) {
2485 glEnable GL_TEXTURE_2D; 2623 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2625 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2490 } 2628 }
2491} 2629}
2492 2630
2631sub DESTROY {
2632 my ($self) = @_;
2633
2634 $self->{timer}->cancel
2635 if $self->{timer};
2636
2637 $self->SUPER::DESTROY;
2638}
2639
2493############################################################################# 2640#############################################################################
2494 2641
2495package CFClient::UI::InventoryItem; 2642package CFClient::UI::InventoryItem;
2496 2643
2497our @ISA = CFClient::UI::HBox::; 2644our @ISA = CFClient::UI::HBox::;
2498 2645
2499sub new { 2646sub _item_to_desc {
2500 my $class = shift; 2647 my ($item) = @_;
2501 2648
2502 my %args = @_; 2649 my $desc =
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2 2650 $item->{nrof} < 2
2507 ? $item->{name} 2651 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}"; 2652 : "$item->{nrof} × $item->{name_pl}";
2509 2653
2510 $item->{flags} & Crossfire::Protocol::F_OPEN 2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)"; 2655 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED 2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)"; 2657 and $desc .= " (applied)";
… …
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED 2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)"; 2665 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED 2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *"; 2667 and $desc .= " *";
2524 2668
2669 $desc
2670}
2671
2672sub new {
2673 my $class = shift;
2674
2675 my %args = @_;
2676
2677 my $item = delete $args{item};
2678
2679 my $desc = _item_to_desc ($item);
2680
2525 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2526 can_hover => 1, 2682 can_hover => 1,
2527 can_events => 1, 2683 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc) 2684 tooltip => ((CFClient::UI::Label::escape $desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub { 2686 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_; 2687 my ($self, $ev, $x, $y) = @_;
2532 2688
2533 # todo: maybe put examine on 1? but should just be a tooltip :( 2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2691 my $targ = $::CONN->{player}{tag};
2692
2693 if ($item->{container} == $::CONN->{player}{tag}) {
2694 $targ = $main::OPENCONT;
2695 }
2696
2697 $::CONN->send ("move $targ $item->{tag} 0");
2534 if ($ev->{button} == 1) { 2698 } elsif ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2699 $::CONN->send ("examine $item->{tag}");
2536 } elsif ($ev->{button} == 2) { 2700 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}"); 2701 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) { 2702 } elsif ($ev->{button} == 3) {
2539 my @menu_items = ( 2703 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2706 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2707 (
2708 $item->{flags} & Crossfire::Protocol::F_LOCKED
2709 ? (
2710 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2711 )
2712 : (
2713 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [ 2715 )
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ], 2716 ),
2548 ); 2717 );
2549 2718
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 } 2720 }
2552 2721
2553 1 2722 1
2554 }, 2723 },
2555 %args 2724 %args
2556 ); 2725 );
2726
2557 2727
2558 $self->add (new CFClient::UI::Face 2728 $self->add (new CFClient::UI::Face
2559 can_events => 0, 2729 can_events => 0,
2560 face => $item->{face}, 2730 face => $item->{face},
2561 anim => $item->{anim}, 2731 anim => $item->{anim},
2562 animspeed => $item->{animspeed}, 2732 animspeed => $item->{animspeed},
2563 ); 2733 );
2564 2734
2565 $self->add (new CFClient::UI::Label 2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2566 can_events => 0, 2736
2567 text => $desc, 2737 $self->{item} = $item;
2568 ); 2738
2739 $self->update_item;
2569 2740
2570 $self 2741 $self
2742}
2743
2744sub update_item {
2745 my ($self) = @_;
2746
2747 my $desc = _item_to_desc ($self->{item});
2748
2749 $self->{name_lbl}->set_text ($desc);
2571} 2750}
2572 2751
2573############################################################################# 2752#############################################################################
2574 2753
2575package CFClient::UI::Inventory; 2754package CFClient::UI::Inventory;
… …
2578 2757
2579sub new { 2758sub new {
2580 my $class = shift; 2759 my $class = shift;
2581 2760
2582 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox), 2762 scrolled => (new CFClient::UI::Table),
2584 @_, 2763 @_,
2585 ); 2764 );
2586 2765
2587 $self 2766 $self
2588} 2767}
… …
2599 } @$items; 2778 } @$items;
2600 2779
2601 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2602 2781
2603 for my $item (@items) { 2782 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2 2783 $item->{item} = $item;
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2609 } 2786 }
2610 2787
2788 my $i = 0;
2789 for (@items) {
2611 $self->{scrolled}->add (@items); 2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2793 }
2612 2794
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614} 2796}
2615 2797
2616sub size_request { 2798sub size_request {
… …
2694 2876
2695package CFClient::UI::Statusbox; 2877package CFClient::UI::Statusbox;
2696 2878
2697our @ISA = CFClient::UI::VBox::; 2879our @ISA = CFClient::UI::VBox::;
2698 2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2699sub reorder { 2890sub reorder {
2700 my ($self) = @_; 2891 my ($self) = @_;
2701 my $NOW = time; 2892 my $NOW = time;
2702 2893
2703 while (my ($k, $v) = each %{ $self->{item} }) { 2894 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2722 : $item->{text}; 2913 : $item->{text};
2723 2914
2724 for ($short) { 2915 for ($short) {
2725 s/^\s+//; 2916 s/^\s+//;
2726 s/\s+/ /g; 2917 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 2918 }
2730 2919
2731 new CFClient::UI::Label 2920 new CFClient::UI::Label
2732 markup => $short, 2921 markup => $short,
2733 tooltip => $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 2923 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 2924 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 2927 fg => $item->{fg},
2738 can_events => 1, 2928 can_events => 1,
2739 can_hover => 1 2929 can_hover => 1
2740 }; 2930 };
2741 } 2931 }
… …
2768 $self->{item}{$group} = { 2958 $self->{item}{$group} = {
2769 id => ++$self->{id}, 2959 id => ++$self->{id},
2770 text => $text, 2960 text => $text,
2771 timeout => $timeout, 2961 timeout => $timeout,
2772 tooltip => $text, 2962 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 2963 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 2964 pri => 0,
2776 count => 1, 2965 count => 1,
2777 %arg, 2966 %arg,
2778 }; 2967 };
2779 } 2968 }
2780 2969
2781 $self->reorder; 2970 $self->reorder;
2782} 2971}
2783 2972
2973sub reconfigure {
2974 my ($self) = @_;
2975
2976 delete $_->{label}
2977 for values %{ $self->{item} || {} };
2978
2979 $self->reorder;
2980 $self->SUPER::reconfigure;
2981}
2982
2784############################################################################# 2983#############################################################################
2785 2984
2786package CFClient::UI::Root; 2985package CFClient::UI::Root;
2787 2986
2788our @ISA = CFClient::UI::Container::; 2987our @ISA = CFClient::UI::Container::;
… …
2871 $child->{x} = int $child->{x}; 3070 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y}; 3071 $child->{y} = int $child->{y};
2873 } 3072 }
2874 3073
2875 $self->SUPER::add (@children); 3074 $self->SUPER::add (@children);
3075
3076 while (@children) {
3077 my $w = pop @children;
3078 push @children, $w->children;
3079 $w->{visible} = 1;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 }
2876} 3093}
2877 3094
2878sub on_refresh { 3095sub on_refresh {
2879 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2880 3097
… …
2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950 glClear GL_COLOR_BUFFER_BIT; 3167 glClear GL_COLOR_BUFFER_BIT;
2951 3168
2952 glMatrixMode GL_PROJECTION; 3169 glMatrixMode GL_PROJECTION;
2953 glLoadIdentity; 3170 glLoadIdentity;
2954 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955 glMatrixMode GL_MODELVIEW; 3172 glMatrixMode GL_MODELVIEW;
2956 glLoadIdentity; 3173 glLoadIdentity;
2957 3174
2958 $self->_draw; 3175 $self->_draw;
2959} 3176}
… …
2961############################################################################# 3178#############################################################################
2962 3179
2963package CFClient::UI; 3180package CFClient::UI;
2964 3181
2965$ROOT = new CFClient::UI::Root; 3182$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3183$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3184
29681 31851
2969 3186

Diff Legend

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