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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size; 40 $TOOLTIP->check_size;
40 $TOOLTIP->update; 41 $TOOLTIP->update;
41 } 42 }
… …
132 133
133 for (@$vals) { 134 for (@$vals) {
134 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
135 $rem += $_ - $i; 136 $rem += $_ - $i;
136 $_ = $i; 137 $_ = $i;
138 }
139}
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
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
137 } 169 }
138} 170}
139 171
140############################################################################# 172#############################################################################
141 173
… …
160 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
162 } 194 }
163 } 195 }
164 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
165 $self 199 $self
166} 200}
167 201
168sub destroy { 202sub destroy {
169 my ($self) = @_; 203 my ($self) = @_;
… …
172 %$self = (); 206 %$self = ();
173} 207}
174 208
175sub show { 209sub show {
176 my ($self) = @_; 210 my ($self) = @_;
177
178 return if $self->{parent}; 211 return if $self->{parent};
179 212
180 $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 );
181} 227}
182 228
183sub hide { 229sub hide {
184 my ($self) = @_; 230 my ($self) = @_;
185 231
… …
242 288
243sub size_allocate { 289sub size_allocate {
244 # nothing to be done 290 # nothing to be done
245} 291}
246 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
247sub children { 300sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260} 301}
261 302
262sub set_max_size { 303sub set_max_size {
263 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
264 305
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 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 }
267} 319}
268 320
269# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
270sub coord2local { 322sub coord2local {
271 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
357 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
358 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
359 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
360 glEnd; 412 glEnd;
361 glPopMatrix; 413 glPopMatrix;
362 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363 } 415 }
364} 416}
365 417
366sub _draw { 418sub _draw {
367 my ($self) = @_; 419 my ($self) = @_;
… …
384sub set_parent { 436sub set_parent {
385 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
386 438
387 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
388 440
441 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size 442 $self->check_size
390 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
391} 446}
392 447
393sub check_size { 448sub check_size {
394 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
395 450
… …
417} 472}
418 473
419sub DESTROY { 474sub DESTROY {
420 my ($self) = @_; 475 my ($self) = @_;
421 476
477 delete $WIDGET{$self+0};
422 #$self->deactivate; 478 #$self->deactivate;
423} 479}
424 480
425############################################################################# 481#############################################################################
426 482
… …
435 my $class = shift; 491 my $class = shift;
436 492
437 # range [value, low, high, page] 493 # range [value, low, high, page]
438 494
439 $class->SUPER::new ( 495 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
442 @_ 498 @_
443 ) 499 )
444} 500}
445 501
446sub _draw { 502sub _draw {
447 my ($self) = @_; 503 my ($self) = @_;
448 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
450 511
451 glEnable GL_BLEND; 512 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
454 515
455 glBegin GL_QUADS; 516 glBegin GL_QUADS;
456 glVertex 0 , 0; 517 glVertex 0 , 0;
457 glVertex 0 , $h; 518 glVertex 0 , $h;
458 glVertex $w, $h; 519 glVertex $w, $h;
459 glVertex $w, 0; 520 glVertex $w, 0;
460 glEnd; 521 glEnd;
461 522
462 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
463} 525}
464 526
465############################################################################# 527#############################################################################
466 528
467package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
628} 690}
629 691
630sub update { 692sub update {
631 my ($self) = @_; 693 my ($self) = @_;
632 694
633 $ROOT->on_refresh ($self => sub { $self->render_child }); 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 696 $self->SUPER::update;
635} 697}
636 698
637sub size_allocate { 699sub size_allocate {
638 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
… …
651 $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 {
652 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
654 716
655 $self->_render; 717 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 718 };
664} 719}
665 720
666sub _draw { 721sub _draw {
667 my ($self) = @_; 722 my ($self) = @_;
… …
671 my $tex = $self->{texture} 726 my $tex = $self->{texture}
672 or return; 727 or return;
673 728
674 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
677 732
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 734
680 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
681} 736}
… …
688 743
689sub size_request { 744sub size_request {
690 my ($self) = @_; 745 my ($self) = @_;
691 746
692 @$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)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 748
695 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
696} 750}
697 751
698sub size_allocate { 752sub size_allocate {
699 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
700 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
701 $self->update; 758 $self->update;
702} 759}
703 760
704sub set_offset { 761sub set_offset {
705 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
764 $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}));
765 }, 822 },
766 ; 823 ;
767 824
768 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 827 slider => $slider,
771 @_, 828 @_,
772 ); 829 );
773 830
774 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 833 $self->add ($self->{slider});
777 834
778 $self 835 $self
779} 836}
780 837
781#TODO# update range on size_allocate depeneing on child 838#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 839# update viewport offset on scroll
783 840
784############################################################################# 841#############################################################################
785 842
786package CFClient::UI::Frame; 843package CFClient::UI::Frame;
787 844
788our @ISA = CFClient::UI::Bin::; 845our @ISA = CFClient::UI::Bin::;
789 846
790use CFClient::OpenGL; 847use CFClient::OpenGL;
848
849sub new {
850 my $class = shift;
851
852 $class->SUPER::new (
853 bg => undef,
854 @_,
855 )
856}
857
858sub _draw {
859 my ($self) = @_;
860
861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
863
864 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} };
867
868 glBegin GL_QUADS;
869 glVertex 0 , 0;
870 glVertex 0 , $h;
871 glVertex $w, $h;
872 glVertex $w, 0;
873 glEnd;
874
875 glDisable GL_BLEND;
876 }
877
878 $self->SUPER::_draw;
879}
791 880
792############################################################################# 881#############################################################################
793 882
794package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
795 884
… …
808 897
809 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
812 border => 0.6, 901 border => 0.6,
902 toplevel => 1,
813 can_events => 1, 903 can_events => 1,
814 @_ 904 @_
815 ); 905 );
816 906
817 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
… …
842 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
843 933
844 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
846 936
847 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848 if $self->{title}; 938 if $self->{title};
849 939
850 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
851} 941}
852 942
… …
1213 1303
1214############################################################################# 1304#############################################################################
1215 1305
1216package CFClient::UI::Label; 1306package CFClient::UI::Label;
1217 1307
1218our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1219 1309
1220use CFClient::OpenGL; 1310use CFClient::OpenGL;
1221 1311
1222sub new { 1312sub new {
1223 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1224 1314
1225 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1227 #font => default_font 1319 #font => default_font
1228 #text => initial text 1320 #text => initial text
1229 #markup => initial narkup 1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1324 layout => (new CFClient::Layout),
1231 fontsize => 1, 1325 fontsize => 1,
1232 align => -1, 1326 align => -1,
1233 valign => -1, 1327 valign => -1,
1234 padding => 2, 1328 padding => 2,
… …
1249 } 1343 }
1250 1344
1251 $self 1345 $self
1252} 1346}
1253 1347
1254sub escape { 1348sub escape($) {
1255 local $_ = $_[1]; 1349 local $_ = $_[0];
1256 1350
1257 s/&/&amp;/g; 1351 s/&/&amp;/g;
1258 s/>/&gt;/g; 1352 s/>/&gt;/g;
1259 s/</&lt;/g; 1353 s/</&lt;/g;
1260 1354
1261 $_[1] 1355 $_
1262} 1356}
1263 1357
1264sub update { 1358sub update {
1265 my ($self) = @_; 1359 my ($self) = @_;
1266 1360
… …
1299sub size_request { 1393sub size_request {
1300 my ($self) = @_; 1394 my ($self) = @_;
1301 1395
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1401
1306 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1307 1403
1308 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1338} 1434}
1339 1435
1340sub _draw { 1436sub _draw {
1341 my ($self) = @_; 1437 my ($self) = @_;
1342 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1343 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1442 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $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});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1448
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350 1450
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1453 : ($self->{w} - $tex->{w}) * 0.5);
1354 1454
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1457 : ($self->{h} - $tex->{h}) * 0.5);
1358 1458
1359 $tex 1459 $tex
1360 }; 1460 };
1361 1461
1362 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
… …
1390 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1391 can_hover => 1, 1491 can_hover => 1,
1392 can_focus => 1, 1492 can_focus => 1,
1393 valign => 0, 1493 valign => 0,
1394 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1395 @_ 1496 @_
1396 ) 1497 )
1397} 1498}
1398 1499
1399sub _set_text { 1500sub _set_text {
… …
1417sub set_text { 1518sub set_text {
1418 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1419 1520
1420 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1522 $self->_set_text ($text);
1523 $self->update;
1422 $self->check_size; 1524 $self->check_size;
1423 $self->update;
1424} 1525}
1425 1526
1426sub get_text { 1527sub get_text {
1427 $_[0]{text} 1528 $_[0]{text}
1428} 1529}
… …
1448 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1450 1551
1451 my $text = $self->get_text; 1552 my $text = $self->get_text;
1452 1553
1453 if ($sym == 8) { 1554 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1567 $self->emit ('escape');
1467 } elsif ($uni) { 1568 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1570 }
1470 1571
1471 $self->_set_text ($text); 1572 $self->_set_text ($text);
1472 $self->update; 1573 $self->update;
1574 $self->check_size;
1473} 1575}
1474 1576
1475sub focus_in { 1577sub focus_in {
1476 my ($self) = @_; 1578 my ($self) = @_;
1477 1579
… …
1606 my $class = shift; 1708 my $class = shift;
1607 1709
1608 $class->SUPER::new ( 1710 $class->SUPER::new (
1609 padding => 4, 1711 padding => 4,
1610 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1613 can_hover => 1, 1714 can_hover => 1,
1614 align => 0, 1715 align => 0,
1615 valign => 0, 1716 valign => 0,
1616 can_events => 1, 1717 can_events => 1,
… …
1664 1765
1665 $class->SUPER::new ( 1766 $class->SUPER::new (
1666 padding => 2, 1767 padding => 2,
1667 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1668 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],
1669 state => 0, 1772 state => 0,
1670 can_hover => 1, 1773 can_hover => 1,
1671 @_ 1774 @_
1672 ) 1775 )
1673} 1776}
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1958 2061
1959sub new { 2062sub new {
1960 my $class = shift; 2063 my $class = shift;
1961 2064
1962 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
1963 2066
1964 # TODO: 0-width page 2067 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2069 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
1969 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],
1970 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
1971 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
1973 vertical => 0, 2078 vertical => 0,
1974 can_hover => 1, 2079 can_hover => 1,
1975 inner_pad => 5, 2080 inner_pad => 0.02,
1976 @_ 2081 @_
1977 ); 2082 );
1978 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
1979 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2098sub set_value {
2099 my ($self, $value) = @_;
2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102
2103 $hi = $lo + 1 if $hi <= $lo;
2104
2105 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi;
2107
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
1980} 2119}
1981 2120
1982sub size_request { 2121sub size_request {
1983 my ($self) = @_; 2122 my ($self) = @_;
1984 2123
… …
1997 2136
1998sub mouse_motion { 2137sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
2000 2139
2001 if ($GRAB == $self) { 2140 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142
2143 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2146
2147 $self->set_value ($x * ($hi - $lo) + $lo);
2148 }
2149}
2150
2151sub update {
2152 my ($self) = @_;
2153
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]);
2156
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2157 my ($value, $lo, $hi, $page) = @{$self->{range}};
2003 2158
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2159 my $inner_w = 1 - 2 * $self->{inner_pad};
2005 2160
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2008 2162
2009 $x -= $inner_pad_px; # substract the padding 2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2164 $value = $self->{scale} * ($value - $lo);
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2165
2015 $self->emit (changed => $x); 2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2016 $self->update; 2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value;
2172 $self->{knob_w} = $page;
2017 } 2173 });
2018}
2019 2174
2020# the inner_* stuff is for generating a padding for the slider handle, 2175 $self->SUPER::update;
2021# so that the handle doesn't leave the texture. This calculation isn't 100%
2022# correct propably, but it does the job for now
2023sub _calc_inner_pad_px {
2024 my ($self, $w) = @_;
2025 ($w / 100) * $self->{inner_pad} # % to pixels
2026} 2176}
2027 2177
2028sub _draw { 2178sub _draw {
2029 my ($self) = @_; 2179 my ($self) = @_;
2030 2180
2031 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
2032 2182
2033 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
2034 2184
2035 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2037 2187
2188 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2190 }
2043 2191
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2194
2047 my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049 $hi = $value + 1 if $lo == $hi;
2050
2051 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054 $page = int $page * $inner_w / ($hi - $lo);
2055 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057 $w -= $page;
2058 $page &= ~1;
2059 glTranslate $page * 0.5, 0, 0;
2060 $page ||= 2;
2061
2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065 glEnable GL_TEXTURE_2D; 2195 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2197
2068 # draw background 2198 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2200
2071 # draw handle 2201 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2203
2074 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2075} 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 (@_) }
2076 2247
2077############################################################################# 2248#############################################################################
2078 2249
2079package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2080 2251
… …
2110 2281
2111 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2283 $self->reflow;
2113} 2284}
2114 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
2115sub text_height { 2298sub text_height {
2116 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2117 2300
2118 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2119 2302
2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2122 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2123 2306
2124 ($layout->size)[1] 2307 ($layout->size)[1]
2125} 2308}
2126 2309
… …
2129 2312
2130 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2131 $self->update; 2314 $self->update;
2132} 2315}
2133 2316
2134sub size_allocate {
2135 my ($self, $w, $h) = @_;
2136
2137 $self->SUPER::size_allocate ($w, $h);
2138
2139 $self->{layout}->set_font ($self->{font}) if $self->{font};
2140 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2141 $self->{layout}->set_width ($self->{children}[0]{w});
2142
2143 $self->reflow;
2144}
2145
2146sub add_paragraph { 2317sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2318 my ($self, $color, $text, $indent) = @_;
2148 2319
2149 #TODO: intelligently "reformat" paragraph 2320 #TODO: intelligently "reformat" paragraph
2150 2321
2322 for my $line (split /\n/, $text) {
2151 my $height = $self->text_height ($text); 2323 my $height = $self->text_height ($line);
2152
2153 $self->{height} += $height; 2324 $self->{height} += $height;
2154
2155 push @{$self->{par}}, [$height, $color, $text]; 2325 push @{$self->{par}}, [$height, $color, $indent, $line];
2326 }
2156 2327
2157 $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}];
2158 $self->{children}[1]->update; 2329 $self->{children}[1]->update;
2159} 2330}
2160 2331
… …
2165 2336
2166 return unless $self->{h} > 0; 2337 return unless $self->{h} > 0;
2167 2338
2168 delete $self->{texture}; 2339 delete $self->{texture};
2169 2340
2170 $ROOT->on_refresh ($self, sub { 2341 $ROOT->on_post_alloc ($self, sub {
2171 if (delete $self->{need_reflow}) { 2342 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2343 my $height = 0;
2173 2344
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2175 for @{$self->{par}}; 2346 for @{$self->{par}};
2176 2347
2177 $self->{height} = $height; 2348 $self->{height} = $height;
2178 2349
2179 $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;
2180 2352
2181 delete $self->{texture}; 2353 delete $self->{texture};
2182 } 2354 }
2183 2355
2184 $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 {
2185 glClearColor 0, 0, 0, 0; 2357 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2358 glClear GL_COLOR_BUFFER_BIT;
2187
2188 glEnable GL_TEXTURE_2D;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190 2359
2191 my $top = int $self->{children}[1]{range}[0]; 2360 my $top = int $self->{children}[1]{range}[0];
2192 2361
2193 my $y0 = $top; 2362 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2363 my $y1 = $top + $self->{h};
… …
2197 2366
2198 my $layout = $self->{layout}; 2367 my $layout = $self->{layout};
2199 2368
2200 $layout->set_font ($self->{font}) if $self->{font}; 2369 $layout->set_font ($self->{font}) if $self->{font};
2201 2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2202 for my $par (@{$self->{par}}) { 2374 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2375 my $h = $par->[0];
2204 2376
2205 if ($y0 < $y + $h && $y < $y1) { 2377 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2207 $layout->set_markup ($par->[2]); 2380 $layout->set_markup ($par->[3]);
2208 2381
2209 my ($W, $H) = $layout->size; 2382 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 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;
2211 } 2386 }
2212 2387
2213 $y += $h; 2388 $y += $h;
2214 } 2389 }
2215 2390
2216 glDisable GL_TEXTURE_2D; 2391 glDisable GL_BLEND;
2217 }; 2392 };
2218 }); 2393 });
2219} 2394}
2220 2395
2221sub _draw { 2396sub _draw {
2222 my ($self) = @_; 2397 my ($self) = @_;
2223 2398
2224 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2401 glColor 1, 1, 1, 1;
2227 $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});
2228 glDisable GL_TEXTURE_2D; 2403 glDisable GL_TEXTURE_2D;
2229 2404
2230 $self->{children}[1]->draw; 2405 $self->{children}[1]->draw;
2231 2406
2232} 2407}
… …
2331 2506
2332sub set_tooltip_from { 2507sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2508 my ($self, $widget) = @_;
2334 2509
2335 $self->add (new CFClient::UI::Label 2510 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2511 markup => $widget->{tooltip},
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2513 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2514 fg => [0, 0, 0, 1],
2515 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2516 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2517 );
2342} 2518}
2343 2519
2344sub size_request { 2520sub size_request {
2345 my ($self) = @_; 2521 my ($self) = @_;
… …
2391use CFClient::OpenGL; 2567use CFClient::OpenGL;
2392 2568
2393sub new { 2569sub new {
2394 my $class = shift; 2570 my $class = shift;
2395 2571
2396 $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2397 aspect => 1, 2573 aspect => 1,
2398 @_, 2574 @_,
2399 ) 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
2400} 2592}
2401 2593
2402sub size_request { 2594sub size_request {
2403 (32, 8) 2595 (32, 8)
2404} 2596}
2405 2597
2598sub update {
2599 my ($self) = @_;
2600
2601 return unless $self->{visible};
2602
2603 $self->SUPER::update;
2604}
2605
2406sub _draw { 2606sub _draw {
2407 my ($self) = @_; 2607 my ($self) = @_;
2408 2608
2409 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
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2621
2412 # TODO animation
2413 if ($tex) { 2622 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2623 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2625 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2419 } 2628 }
2420} 2629}
2421 2630
2631sub DESTROY {
2632 my ($self) = @_;
2633
2634 $self->{timer}->cancel
2635 if $self->{timer};
2636
2637 $self->SUPER::DESTROY;
2638}
2639
2422############################################################################# 2640#############################################################################
2423 2641
2424package CFClient::UI::InventoryItem; 2642package CFClient::UI::InventoryItem;
2425 2643
2426our @ISA = CFClient::UI::HBox::; 2644our @ISA = CFClient::UI::HBox::;
2645
2646sub _item_to_desc {
2647 my ($item) = @_;
2648
2649 my $desc =
2650 $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} × $item->{name_pl}";
2653
2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2655 and $desc .= " (open)";
2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2657 and $desc .= " (applied)";
2658 $item->{flags} & Crossfire::Protocol::F_UNPAID
2659 and $desc .= " (unpaid)";
2660 $item->{flags} & Crossfire::Protocol::F_MAGIC
2661 and $desc .= " (magic)";
2662 $item->{flags} & Crossfire::Protocol::F_CURSED
2663 and $desc .= " (cursed)";
2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2665 and $desc .= " (damned)";
2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2667 and $desc .= " *";
2668
2669 $desc
2670}
2427 2671
2428sub new { 2672sub new {
2429 my $class = shift; 2673 my $class = shift;
2430 2674
2431 my %args = @_; 2675 my %args = @_;
2432 2676
2433 my $item = delete $args{item}; 2677 my $item = delete $args{item};
2434 2678
2435 my $desc = $item->{nrof} < 2 2679 my $desc = _item_to_desc ($item);
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439 2680
2440 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2441 can_hover => 1, 2682 can_hover => 1,
2442 can_events => 1, 2683 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc) 2684 tooltip => ((CFClient::UI::Label::escape $desc)
2444 . "\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>"),
2445 connect_button_down => sub { 2686 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_; 2687 my ($self, $ev, $x, $y) = @_;
2447 2688
2448 # 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");
2449 if ($ev->{button} == 1) { 2698 } elsif ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2699 $::CONN->send ("examine $item->{tag}");
2451 } elsif ($ev->{button} == 2) { 2700 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}"); 2701 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) { 2702 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new ( 2703 my @menu_items = (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2462 ["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}) }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2464 ], 2716 ),
2465 )->popup ($ev); 2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2466 } 2720 }
2467 2721
2468 1 2722 1
2469 }, 2723 },
2470 %args 2724 %args
2471 ); 2725 );
2726
2472 2727
2473 $self->add (new CFClient::UI::Face 2728 $self->add (new CFClient::UI::Face
2474 can_events => 0, 2729 can_events => 0,
2475 face => $item->{face}, 2730 face => $item->{face},
2476 anim => $item->{anim}, 2731 anim => $item->{anim},
2477 animspeed => $item->{animspeed}, 2732 animspeed => $item->{animspeed},
2478 ); 2733 );
2479 2734
2480 $self->add (new CFClient::UI::Label 2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2481 can_events => 0, 2736
2482 text => $desc, 2737 $self->{item} = $item;
2483 ); 2738
2739 $self->update_item;
2484 2740
2485 $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);
2486} 2750}
2487 2751
2488############################################################################# 2752#############################################################################
2489 2753
2490package CFClient::UI::Inventory; 2754package CFClient::UI::Inventory;
… …
2493 2757
2494sub new { 2758sub new {
2495 my $class = shift; 2759 my $class = shift;
2496 2760
2497 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox), 2762 scrolled => (new CFClient::UI::Table),
2499 @_, 2763 @_,
2500 ); 2764 );
2501 2765
2502 $self 2766 $self
2503} 2767}
… …
2506 my ($self, $items) = @_; 2770 my ($self, $items) = @_;
2507 2771
2508 $self->{scrolled}->clear; 2772 $self->{scrolled}->clear;
2509 return unless $items; 2773 return unless $items;
2510 2774
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2512 2779
2513 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2514 2781
2515 for my $item (@items) { 2782 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2 2783 $item->{item} = $item;
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2786 }
2787
2788 my $i = 0;
2789 for (@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);
2521 } 2793 }
2522 2794
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524} 2796}
2525 2797
… …
2604 2876
2605package CFClient::UI::Statusbox; 2877package CFClient::UI::Statusbox;
2606 2878
2607our @ISA = CFClient::UI::VBox::; 2879our @ISA = CFClient::UI::VBox::;
2608 2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2609sub reorder { 2890sub reorder {
2610 my ($self) = @_; 2891 my ($self) = @_;
2611 my $NOW = time; 2892 my $NOW = time;
2612 2893
2613 while (my ($k, $v) = each %{ $self->{item} }) { 2894 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2912 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2913 : $item->{text};
2633 2914
2634 for ($short) { 2915 for ($short) {
2635 s/^\s+//; 2916 s/^\s+//;
2636 s/\012.*/…/s; 2917 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2918 }
2640 2919
2641 new CFClient::UI::Label 2920 new CFClient::UI::Label
2642 markup => $short, 2921 markup => $short,
2643 tooltip => $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2923 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2924 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2927 fg => $item->{fg},
2648 can_events => 1, 2928 can_events => 1,
2649 can_hover => 1 2929 can_hover => 1
2650 }; 2930 };
2651 } 2931 }
2652 2932
… …
2654 $self->SUPER::add (reverse @widgets); 2934 $self->SUPER::add (reverse @widgets);
2655} 2935}
2656 2936
2657sub add { 2937sub add {
2658 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2939
2940 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//;
2659 2942
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 2943 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 2944
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2945 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 2946
… …
2666 $item->{count}++; 2949 $item->{count}++;
2667 } else { 2950 } else {
2668 $item->{count} = 1; 2951 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 2952 $item->{text} = $item->{tooltip} = $text;
2670 } 2953 }
2954 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 2955 $item->{timeout} = $timeout;
2672 delete $item->{label}; 2956 delete $item->{label};
2673 } else { 2957 } else {
2674 $self->{item}{$group} = { 2958 $self->{item}{$group} = {
2675 id => ++$self->{id}, 2959 id => ++$self->{id},
2676 text => $text, 2960 text => $text,
2677 timeout => $timeout, 2961 timeout => $timeout,
2678 tooltip => $text, 2962 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 2963 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 2964 pri => 0,
2682 count => 1, 2965 count => 1,
2683 %arg, 2966 %arg,
2684 }; 2967 };
2685 } 2968 }
2686 2969
2687 $self->reorder; 2970 $self->reorder;
2688} 2971}
2689 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
2690############################################################################# 2983#############################################################################
2691 2984
2692package CFClient::UI::Root; 2985package CFClient::UI::Root;
2693 2986
2694our @ISA = CFClient::UI::Container::; 2987our @ISA = CFClient::UI::Container::;
… …
2724} 3017}
2725 3018
2726sub size_allocate { 3019sub size_allocate {
2727 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h) = @_;
2728 3021
2729 my $old_w = $self->{old_w}; 3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2730 my $old_h = $self->{old_h}; 3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2731 3024
2732 if ($old_w && $old_h) { 3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2733 for my $child ($self->children) { 3026 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744 3027
2745 for my $child ($self->children) { 3028 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 3030
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x};
3033
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
2750 $child->configure ($X, $Y, $W, $H); 3040 $child->configure ($X, $Y, $W, $H);
2751 } 3041 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 3042}
2756 3043
2757sub coord2local { 3044sub coord2local {
2758 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2759 3046
… …
2772 $self->check_size; 3059 $self->check_size;
2773 $::WANT_REFRESH++; 3060 $::WANT_REFRESH++;
2774} 3061}
2775 3062
2776sub add { 3063sub add {
2777 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2778 3065
3066 for my $child (@children) {
3067 $child->{toplevel} = 1;
3068
2779 # integerise window positions 3069 # integerise window positions
2780 $child->{x} = int $child->{x}; 3070 $child->{x} = int $child->{x};
2781 $child->{y} = int $child->{y}; 3071 $child->{y} = int $child->{y};
3072 }
2782 3073
2783 $self->SUPER::add ($child); 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 }
2784} 3093}
2785 3094
2786sub on_refresh { 3095sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2788 3097
2789 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2790} 3099}
2791 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2792sub draw { 3107sub draw {
2793 my ($self) = @_; 3108 my ($self) = @_;
3109
3110 while ($self->{refresh_hook}) {
3111 $_->()
3112 for values %{delete $self->{refresh_hook}};
3113 }
2794 3114
2795 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
2796 my @queue = ([], []); 3116 my @queue = ([], []);
2797 3117
2798 for (;;) { 3118 for (;;) {
… …
2835 $widget->size_allocate ($w, $h); 3155 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h); 3156 $widget->emit (size_allocate => $w, $h);
2837 } 3157 }
2838 } 3158 }
2839 3159
2840 while ($self->{refresh_hook}) { 3160 while ($self->{post_alloc_hook}) {
2841 $_->() 3161 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3162 for values %{delete $self->{post_alloc_hook}};
2843 } 3163 }
2844 3164
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3165 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3167 glClear GL_COLOR_BUFFER_BIT;
2848 3168
2849 glMatrixMode GL_PROJECTION; 3169 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3170 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3172 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3173 glLoadIdentity;
2854 3174
2855 $self->_draw; 3175 $self->_draw;
2856} 3176}
… …
2858############################################################################# 3178#############################################################################
2859 3179
2860package CFClient::UI; 3180package CFClient::UI;
2861 3181
2862$ROOT = new CFClient::UI::Root; 3182$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3183$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3184
28651 31851
2866 3186

Diff Legend

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