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.229 by root, Wed May 24 21:49:58 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) = @_;
… …
759 816
760 my $slider = new CFClient::UI::Slider 817 my $slider = new CFClient::UI::Slider
761 vertical => 1, 818 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 819 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 820 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1]);
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
838sub size_allocate {
839 my ($self, $w, $h) = @_;
840
841 $self->SUPER::size_allocate ($w, $h);
842
843 my $child = $self->{vp}->child;
844 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
845}
846
781#TODO# update range on size_allocate depeneing on child 847#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 848# update viewport offset on scroll
783 849
784############################################################################# 850#############################################################################
785 851
786package CFClient::UI::Frame; 852package CFClient::UI::Frame;
787 853
788our @ISA = CFClient::UI::Bin::; 854our @ISA = CFClient::UI::Bin::;
789 855
790use CFClient::OpenGL; 856use CFClient::OpenGL;
857
858sub new {
859 my $class = shift;
860
861 $class->SUPER::new (
862 bg => undef,
863 @_,
864 )
865}
866
867sub _draw {
868 my ($self) = @_;
869
870 if ($self->{bg}) {
871 my ($w, $h) = @$self{qw(w h)};
872
873 glEnable GL_BLEND;
874 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
875 glColor @{ $self->{bg} };
876
877 glBegin GL_QUADS;
878 glVertex 0 , 0;
879 glVertex 0 , $h;
880 glVertex $w, $h;
881 glVertex $w, 0;
882 glEnd;
883
884 glDisable GL_BLEND;
885 }
886
887 $self->SUPER::_draw;
888}
791 889
792############################################################################# 890#############################################################################
793 891
794package CFClient::UI::FancyFrame; 892package CFClient::UI::FancyFrame;
795 893
… …
808 906
809 my $self = $class->SUPER::new ( 907 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 908 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 909 border_bg => [1, 1, 1, 1],
812 border => 0.6, 910 border => 0.6,
911 toplevel => 1,
813 can_events => 1, 912 can_events => 1,
814 @_ 913 @_
815 ); 914 );
816 915
817 $self->{title} &&= new CFClient::UI::Label 916 $self->{title} &&= new CFClient::UI::Label
… …
842 my ($self, $w, $h) = @_; 941 my ($self, $w, $h) = @_;
843 942
844 $h -= List::Util::max 0, $self->border * 2; 943 $h -= List::Util::max 0, $self->border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 944 $w -= List::Util::max 0, $self->border * 2;
846 945
847 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 946 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848 if $self->{title}; 947 if $self->{title};
849 948
850 $self->child->configure ($self->border, $self->border, $w, $h); 949 $self->child->configure ($self->border, $self->border, $w, $h);
851} 950}
852 951
… …
1213 1312
1214############################################################################# 1313#############################################################################
1215 1314
1216package CFClient::UI::Label; 1315package CFClient::UI::Label;
1217 1316
1218our @ISA = CFClient::UI::Base::; 1317our @ISA = CFClient::UI::DrawBG::;
1219 1318
1220use CFClient::OpenGL; 1319use CFClient::OpenGL;
1221 1320
1222sub new { 1321sub new {
1223 my ($class, %arg) = @_; 1322 my ($class, %arg) = @_;
1224 1323
1225 my $self = $class->SUPER::new ( 1324 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1325 fg => [1, 1, 1],
1326 #bg => none
1327 #active_bg => none
1227 #font => default_font 1328 #font => default_font
1228 #text => initial text 1329 #text => initial text
1229 #markup => initial narkup 1330 #markup => initial narkup
1331 #max_w => maximum pixel width
1332 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1333 layout => (new CFClient::Layout),
1231 fontsize => 1, 1334 fontsize => 1,
1232 align => -1, 1335 align => -1,
1233 valign => -1, 1336 valign => -1,
1234 padding => 2, 1337 padding => 2,
… …
1249 } 1352 }
1250 1353
1251 $self 1354 $self
1252} 1355}
1253 1356
1254sub escape { 1357sub escape($) {
1255 local $_ = $_[1]; 1358 local $_ = $_[0];
1256 1359
1257 s/&/&amp;/g; 1360 s/&/&amp;/g;
1258 s/>/&gt;/g; 1361 s/>/&gt;/g;
1259 s/</&lt;/g; 1362 s/</&lt;/g;
1260 1363
1261 $_[1] 1364 $_
1262} 1365}
1263 1366
1264sub update { 1367sub update {
1265 my ($self) = @_; 1368 my ($self) = @_;
1266 1369
… …
1299sub size_request { 1402sub size_request {
1300 my ($self) = @_; 1403 my ($self) = @_;
1301 1404
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1405 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{max_w} || -1); 1406 $self->{layout}->set_width ($self->{max_w} || -1);
1407 $self->{layout}->set_ellipsise ($self->{ellipsise});
1408 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1409 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1410
1306 my ($w, $h) = $self->{layout}->size; 1411 my ($w, $h) = $self->{layout}->size;
1307 1412
1308 if (exists $self->{template}) { 1413 if (exists $self->{template}) {
… …
1338} 1443}
1339 1444
1340sub _draw { 1445sub _draw {
1341 my ($self) = @_; 1446 my ($self) = @_;
1342 1447
1448 $self->SUPER::_draw; # draw background, if applicable
1449
1343 my $tex = $self->{texture} ||= do { 1450 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1451 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1452 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $self->{layout}->set_width ($self->{w}); 1453 $self->{layout}->set_width ($self->{w});
1454 $self->{layout}->set_ellipsise ($self->{ellipsise});
1455 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1456 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1457
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1458 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350 1459
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1460 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1461 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1462 : ($self->{w} - $tex->{w}) * 0.5);
1354 1463
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1464 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1465 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1466 : ($self->{h} - $tex->{h}) * 0.5);
1358 1467
1359 $tex 1468 $tex
1360 }; 1469 };
1361 1470
1362 glEnable GL_TEXTURE_2D; 1471 glEnable GL_TEXTURE_2D;
… …
1390 active_fg => [0, 0, 0], 1499 active_fg => [0, 0, 0],
1391 can_hover => 1, 1500 can_hover => 1,
1392 can_focus => 1, 1501 can_focus => 1,
1393 valign => 0, 1502 valign => 0,
1394 can_events => 1, 1503 can_events => 1,
1504 #text => ...
1395 @_ 1505 @_
1396 ) 1506 )
1397} 1507}
1398 1508
1399sub _set_text { 1509sub _set_text {
… …
1417sub set_text { 1527sub set_text {
1418 my ($self, $text) = @_; 1528 my ($self, $text) = @_;
1419 1529
1420 $self->{cursor} = length $text; 1530 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1531 $self->_set_text ($text);
1532 $self->update;
1422 $self->check_size; 1533 $self->check_size;
1423 $self->update;
1424} 1534}
1425 1535
1426sub get_text { 1536sub get_text {
1427 $_[0]{text} 1537 $_[0]{text}
1428} 1538}
… …
1448 my $sym = $ev->{sym}; 1558 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1559 my $uni = $ev->{unicode};
1450 1560
1451 my $text = $self->get_text; 1561 my $text = $self->get_text;
1452 1562
1453 if ($sym == 8) { 1563 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1564 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1565 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1566 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1567 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1568 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1569 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1570 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1571 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1572 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1573 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1574 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1575 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1576 $self->emit ('escape');
1467 } elsif ($uni) { 1577 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1578 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1579 }
1470 1580
1471 $self->_set_text ($text); 1581 $self->_set_text ($text);
1472 $self->update; 1582 $self->update;
1583 $self->check_size;
1473} 1584}
1474 1585
1475sub focus_in { 1586sub focus_in {
1476 my ($self) = @_; 1587 my ($self) = @_;
1477 1588
… …
1606 my $class = shift; 1717 my $class = shift;
1607 1718
1608 $class->SUPER::new ( 1719 $class->SUPER::new (
1609 padding => 4, 1720 padding => 4,
1610 fg => [1, 1, 1], 1721 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1722 active_fg => [0, 0, 1],
1613 can_hover => 1, 1723 can_hover => 1,
1614 align => 0, 1724 align => 0,
1615 valign => 0, 1725 valign => 0,
1616 can_events => 1, 1726 can_events => 1,
… …
1664 1774
1665 $class->SUPER::new ( 1775 $class->SUPER::new (
1666 padding => 2, 1776 padding => 2,
1667 fg => [1, 1, 1], 1777 fg => [1, 1, 1],
1668 active_fg => [1, 1, 0], 1778 active_fg => [1, 1, 0],
1779 bg => [0, 0, 0, 0.2],
1780 active_bg => [1, 1, 1, 0.5],
1669 state => 0, 1781 state => 0,
1670 can_hover => 1, 1782 can_hover => 1,
1671 @_ 1783 @_
1672 ) 1784 )
1673} 1785}
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2069 qw(s1_slider.png s1_slider_bg.png);
1958 2070
1959sub new { 2071sub new {
1960 my $class = shift; 2072 my $class = shift;
1961 2073
1962 # range [value, low, high, page] 2074 # range [value, low, high, page, unit]
1963 2075
1964 # TODO: 0-width page 2076 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2077 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2078 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
1969 active_fg => [0, 0, 0], 2081 active_fg => [0, 0, 0],
2082 bg => [0, 0, 0, 0.2],
2083 active_bg => [1, 1, 1, 0.5],
1970 range => [0, 0, 100, 10], 2084 range => [0, 0, 100, 10, 0],
1971 req_w => $::WIDTH / 80, 2085 req_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2086 req_h => $::WIDTH / 80,
1973 vertical => 0, 2087 vertical => 0,
1974 can_hover => 1, 2088 can_hover => 1,
1975 inner_pad => 5, 2089 inner_pad => 0.02,
1976 @_ 2090 @_
1977 ); 2091 );
1978 2092
2093 $self->set_value ($self->{range}[0]);
2094 $self->update;
2095
1979 $self 2096 $self
2097}
2098
2099sub set_range {
2100 my ($self, $range) = @_;
2101
2102 $self->{range} = $range;
2103
2104 $self->update;
2105}
2106
2107sub set_value {
2108 my ($self, $value) = @_;
2109
2110 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2111
2112 $hi = $lo + 1 if $hi <= $lo;
2113
2114 $page = $hi - $lo if $page > $hi - $lo;
2115
2116 $value = $lo if $value < $lo;
2117 $value = $hi - $page if $value > $hi - $page;
2118
2119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2120 if $unit;
2121
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123
2124 if ($value != $old_value) {
2125 $self->emit (changed => $value);
2126 $self->update;
2127 }
1980} 2128}
1981 2129
1982sub size_request { 2130sub size_request {
1983 my ($self) = @_; 2131 my ($self) = @_;
1984 2132
… …
1990 2138
1991sub button_down { 2139sub button_down {
1992 my ($self, $ev, $x, $y) = @_; 2140 my ($self, $ev, $x, $y) = @_;
1993 2141
1994 $self->SUPER::button_down ($ev, $x, $y); 2142 $self->SUPER::button_down ($ev, $x, $y);
2143
2144 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2145
1995 $self->mouse_motion ($ev, $x, $y); 2146 $self->mouse_motion ($ev, $x, $y);
1996} 2147}
1997 2148
1998sub mouse_motion { 2149sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2150 my ($self, $ev, $x, $y) = @_;
2000 2151
2001 if ($GRAB == $self) { 2152 if ($GRAB == $self) {
2153 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2154
2155 my (undef, $lo, $hi, $page) = @{$self->{range}};
2156
2157 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2158
2159 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2160 }
2161}
2162
2163sub update {
2164 my ($self) = @_;
2165
2166 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2167 $self->set_value ($self->{range}[0]);
2168
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2169 my ($value, $lo, $hi, $page) = @{$self->{range}};
2170 my $range = ($hi - $page - $lo) || 1e-100;
2003 2171
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2172 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005 2173
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2174 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2175 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008 2176
2009 $x -= $inner_pad_px; # substract the padding 2177 $value = ($value - $lo) / $range;
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2178 $value = $value * $self->{scale} + $self->{offset};
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2179
2015 $self->emit (changed => $x); 2180 $self->{knob_x} = $value - $knob_w * 0.5;
2016 $self->update; 2181 $self->{knob_w} = $knob_w;
2017 } 2182 });
2018}
2019 2183
2020# the inner_* stuff is for generating a padding for the slider handle, 2184 $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} 2185}
2027 2186
2028sub _draw { 2187sub _draw {
2029 my ($self) = @_; 2188 my ($self) = @_;
2030 2189
2031 $self->SUPER::_draw (); 2190 $self->SUPER::_draw ();
2032 2191
2033 my ($w, $h) = @$self{qw(w h)}; 2192 glScale $self->{w}, $self->{h};
2034 2193
2035 if ($self->{vertical}) { 2194 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2195 # draw a vertical slider like a rotated horizontal slider
2037 2196
2197 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2198 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2199 }
2043 2200
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2201 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2202 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2203
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; 2204 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2206
2068 # draw background 2207 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2208 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2209
2071 # draw handle 2210 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2211 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2212
2074 glDisable GL_TEXTURE_2D; 2213 glDisable GL_TEXTURE_2D;
2075} 2214}
2215
2216#############################################################################
2217
2218package CFClient::UI::ValSlider;
2219
2220our @ISA = CFClient::UI::HBox::;
2221
2222sub new {
2223 my ($class, %arg) = @_;
2224
2225 my $range = delete $arg{range};
2226
2227 my $self = $class->SUPER::new (
2228 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2229 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2230 to_value => sub { shift },
2231 from_value => sub { shift },
2232 %arg,
2233 );
2234
2235 $self->{slider}->connect (changed => sub {
2236 my ($self, $value) = @_;
2237 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2238 $self->{parent}->emit (changed => $value);
2239 });
2240
2241# $self->{entry}->connect (changed => sub {
2242# my ($self, $value) = @_;
2243# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2244# $self->{parent}->emit (changed => $value);
2245# });
2246
2247 $self->add ($self->{slider}, $self->{entry});
2248
2249 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2250
2251 $self
2252}
2253
2254sub set_range { shift->{slider}->set_range (@_) }
2255sub set_value { shift->{slider}->set_value (@_) }
2076 2256
2077############################################################################# 2257#############################################################################
2078 2258
2079package CFClient::UI::TextView; 2259package CFClient::UI::TextView;
2080 2260
… …
2110 2290
2111 $self->{fontsize} = $fontsize; 2291 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2292 $self->reflow;
2113} 2293}
2114 2294
2115sub text_height {
2116 my ($self, $text) = @_;
2117
2118 my $layout = $self->{layout};
2119
2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $layout->set_width ($self->{children}[0]{w});
2122 $layout->set_markup ($text);
2123
2124 ($layout->size)[1]
2125}
2126
2127sub reflow {
2128 my ($self) = @_;
2129
2130 $self->{need_reflow}++;
2131 $self->update;
2132}
2133
2134sub size_allocate { 2295sub size_allocate {
2135 my ($self, $w, $h) = @_; 2296 my ($self, $w, $h) = @_;
2136 2297
2137 $self->SUPER::size_allocate ($w, $h); 2298 $self->SUPER::size_allocate ($w, $h);
2138 2299
… …
2141 $self->{layout}->set_width ($self->{children}[0]{w}); 2302 $self->{layout}->set_width ($self->{children}[0]{w});
2142 2303
2143 $self->reflow; 2304 $self->reflow;
2144} 2305}
2145 2306
2307sub text_size {
2308 my ($self, $text, $indent) = @_;
2309
2310 my $layout = $self->{layout};
2311
2312 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2313 $layout->set_width ($self->{children}[0]{w} - $indent);
2314 $layout->set_markup ($text);
2315
2316 $layout->size
2317}
2318
2319sub reflow {
2320 my ($self) = @_;
2321
2322 $self->{need_reflow}++;
2323 $self->update;
2324}
2325
2326sub set_offset {
2327 my ($self, $offset) = @_;
2328
2329 # todo: base offset on lines or so, not on pixels
2330 $self->{children}[1]->set_value ($offset);
2331}
2332
2333sub clear {
2334 my ($self) = @_;
2335
2336 $self->{par} = [];
2337 $self->{height} = 0;
2338 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2339}
2340
2146sub add_paragraph { 2341sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2342 my ($self, $color, $text, $indent) = @_;
2148 2343
2149 #TODO: intelligently "reformat" paragraph 2344 for my $line (split /\n/, $text) {
2150 2345 my ($w, $h) = $self->text_size ($line);
2151 my $height = $self->text_height ($text);
2152
2153 $self->{height} += $height; 2346 $self->{height} += $h;
2347 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2348 }
2154 2349
2155 push @{$self->{par}}, [$height, $color, $text];
2156
2157 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2350 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158 $self->{children}[1]->update;
2159} 2351}
2160 2352
2161sub update { 2353sub update {
2162 my ($self) = @_; 2354 my ($self) = @_;
2163 2355
… …
2165 2357
2166 return unless $self->{h} > 0; 2358 return unless $self->{h} > 0;
2167 2359
2168 delete $self->{texture}; 2360 delete $self->{texture};
2169 2361
2170 $ROOT->on_refresh ($self, sub { 2362 $ROOT->on_post_alloc ($self, sub {
2363 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2364
2171 if (delete $self->{need_reflow}) { 2365 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2366 my $height = 0;
2173 2367
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2368 my $layout = $self->{layout};
2369
2370 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2371
2175 for @{$self->{par}}; 2372 for (@{$self->{par}}) {
2373 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2374 $layout->set_width ($W - $_->[3]);
2375 $layout->set_markup ($_->[4]);
2376 my ($w, $h) = $layout->size;
2377 $_->[0] = $w + $_->[3];
2378 $_->[1] = $h;
2379 }
2380
2381 $height += $_->[1];
2382 }
2176 2383
2177 $self->{height} = $height; 2384 $self->{height} = $height;
2178 2385
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2386 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180 2387
2181 delete $self->{texture}; 2388 delete $self->{texture};
2182 } 2389 }
2183 2390
2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2391 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185 glClearColor 0, 0, 0, 0; 2392 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2393 glClear GL_COLOR_BUFFER_BIT;
2187 2394
2188 glEnable GL_TEXTURE_2D;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191 my $top = int $self->{children}[1]{range}[0]; 2395 my $top = int $self->{children}[1]{range}[0];
2192 2396
2193 my $y0 = $top; 2397 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2398 my $y1 = $top + $H;
2195 2399
2196 my $y = 0; 2400 my $y = 0;
2197 2401
2198 my $layout = $self->{layout}; 2402 my $layout = $self->{layout};
2199 2403
2200 $layout->set_font ($self->{font}) if $self->{font}; 2404 $layout->set_font ($self->{font}) if $self->{font};
2201 2405
2406 glEnable GL_BLEND;
2407 #TODO# not correct in windows where rgba is forced off
2408 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2409
2202 for my $par (@{$self->{par}}) { 2410 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2411 my $h = $par->[1];
2204 2412
2205 if ($y0 < $y + $h && $y < $y1) { 2413 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2414 $layout->set_foreground (@{ $par->[2] });
2415 $layout->set_width ($W - $par->[3]);
2207 $layout->set_markup ($par->[2]); 2416 $layout->set_markup ($par->[4]);
2208 2417
2209 my ($W, $H) = $layout->size; 2418 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2419
2420 glRasterPos $par->[3], $y - $y0;
2421 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211 } 2422 }
2212 2423
2213 $y += $h; 2424 $y += $h;
2214 } 2425 }
2215 2426
2216 glDisable GL_TEXTURE_2D; 2427 glDisable GL_BLEND;
2217 }; 2428 };
2218 }); 2429 });
2219} 2430}
2220 2431
2221sub _draw { 2432sub _draw {
2222 my ($self) = @_; 2433 my ($self) = @_;
2223 2434
2224 glEnable GL_TEXTURE_2D; 2435 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2437 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2438 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228 glDisable GL_TEXTURE_2D; 2439 glDisable GL_TEXTURE_2D;
2229 2440
2230 $self->{children}[1]->draw; 2441 $self->{children}[1]->draw;
2231 2442
2232} 2443}
… …
2331 2542
2332sub set_tooltip_from { 2543sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2544 my ($self, $widget) = @_;
2334 2545
2335 $self->add (new CFClient::UI::Label 2546 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2547 markup => $widget->{tooltip},
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2548 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2549 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2550 fg => [0, 0, 0, 1],
2551 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2552 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2553 );
2342} 2554}
2343 2555
2344sub size_request { 2556sub size_request {
2345 my ($self) = @_; 2557 my ($self) = @_;
… …
2391use CFClient::OpenGL; 2603use CFClient::OpenGL;
2392 2604
2393sub new { 2605sub new {
2394 my $class = shift; 2606 my $class = shift;
2395 2607
2396 $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2397 aspect => 1, 2609 aspect => 1,
2398 @_, 2610 @_,
2399 ) 2611 );
2612
2613 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self);
2615
2616 $self->{timer} = Event->timer (
2617 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2618 hard => 1,
2619 interval => $self->{animspeed},
2620 cb => sub {
2621 ++$widget->{frame};
2622 $widget->update;
2623 },
2624 );
2625 }
2626
2627 $self
2400} 2628}
2401 2629
2402sub size_request { 2630sub size_request {
2403 (32, 8) 2631 (32, 8)
2404} 2632}
2405 2633
2634sub update {
2635 my ($self) = @_;
2636
2637 return unless $self->{visible};
2638
2639 $self->SUPER::update;
2640}
2641
2406sub _draw { 2642sub _draw {
2407 my ($self) = @_; 2643 my ($self) = @_;
2408 2644
2409 return unless $::CONN;#d# manage and cache textures differently 2645 return unless $::CONN;
2646
2647 my $face;
2648
2649 if ($self->{frame}) {
2650 my $anim = $::CONN->{anim}[$self->{anim}];
2651
2652 $face = $anim->[ $self->{frame} % @$anim ]
2653 if $anim && @$anim;
2654 }
2655
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2656 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2657
2412 # TODO animation
2413 if ($tex) { 2658 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2659 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2661 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2662 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2663 glDisable GL_TEXTURE_2D;
2419 } 2664 }
2420} 2665}
2421 2666
2667sub DESTROY {
2668 my ($self) = @_;
2669
2670 $self->{timer}->cancel
2671 if $self->{timer};
2672
2673 $self->SUPER::DESTROY;
2674}
2675
2422############################################################################# 2676#############################################################################
2423 2677
2424package CFClient::UI::InventoryItem; 2678package CFClient::UI::InventoryItem;
2425 2679
2426our @ISA = CFClient::UI::HBox::; 2680our @ISA = CFClient::UI::HBox::;
2681
2682sub _item_to_desc {
2683 my ($item) = @_;
2684
2685 my $desc =
2686 $item->{nrof} < 2
2687 ? $item->{name}
2688 : "$item->{nrof} × $item->{name_pl}";
2689
2690 $item->{flags} & Crossfire::Protocol::F_OPEN
2691 and $desc .= " (open)";
2692 $item->{flags} & Crossfire::Protocol::F_APPLIED
2693 and $desc .= " (applied)";
2694 $item->{flags} & Crossfire::Protocol::F_UNPAID
2695 and $desc .= " (unpaid)";
2696 $item->{flags} & Crossfire::Protocol::F_MAGIC
2697 and $desc .= " (magic)";
2698 $item->{flags} & Crossfire::Protocol::F_CURSED
2699 and $desc .= " (cursed)";
2700 $item->{flags} & Crossfire::Protocol::F_DAMNED
2701 and $desc .= " (damned)";
2702 $item->{flags} & Crossfire::Protocol::F_LOCKED
2703 and $desc .= " *";
2704
2705 $desc
2706}
2427 2707
2428sub new { 2708sub new {
2429 my $class = shift; 2709 my $class = shift;
2430 2710
2431 my %args = @_; 2711 my %args = @_;
2432 2712
2433 my $item = delete $args{item}; 2713 my $item = delete $args{item};
2434 2714
2435 my $desc = $item->{nrof} < 2 2715 my $desc = _item_to_desc ($item);
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439 2716
2440 my $self = $class->SUPER::new ( 2717 my $self = $class->SUPER::new (
2441 can_hover => 1, 2718 can_hover => 1,
2442 can_events => 1, 2719 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc) 2720 tooltip => ((CFClient::UI::Label::escape $desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub { 2722 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_; 2723 my ($self, $ev, $x, $y) = @_;
2447 2724
2448 # todo: maybe put examine on 1? but should just be a tooltip :( 2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2727 my $targ = $::CONN->{player}{tag};
2728
2729 if ($item->{container} == $::CONN->{player}{tag}) {
2730 $targ = $main::OPENCONT;
2731 }
2732
2733 $::CONN->send ("move $targ $item->{tag} 0");
2449 if ($ev->{button} == 1) { 2734 } elsif ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2735 $::CONN->send ("examine $item->{tag}");
2451 } elsif ($ev->{button} == 2) { 2736 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}"); 2737 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) { 2738 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new ( 2739 my @menu_items = (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2740 ["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}") }], 2741 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2742 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2743 (
2744 $item->{flags} & Crossfire::Protocol::F_LOCKED
2745 ? (
2746 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2747 )
2748 : (
2749 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2750 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2751 )
2464 ], 2752 ),
2465 )->popup ($ev); 2753 );
2754
2755 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2466 } 2756 }
2467 2757
2468 1 2758 1
2469 }, 2759 },
2470 %args 2760 %args
2471 ); 2761 );
2762
2472 2763
2473 $self->add (new CFClient::UI::Face 2764 $self->add (new CFClient::UI::Face
2474 can_events => 0, 2765 can_events => 0,
2475 face => $item->{face}, 2766 face => $item->{face},
2476 anim => $item->{anim}, 2767 anim => $item->{anim},
2477 animspeed => $item->{animspeed}, 2768 animspeed => $item->{animspeed},
2478 ); 2769 );
2479 2770
2480 $self->add (new CFClient::UI::Label 2771 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2481 can_events => 0, 2772
2482 text => $desc, 2773 $self->{item} = $item;
2483 ); 2774
2775 $self->update_item;
2484 2776
2485 $self 2777 $self
2778}
2779
2780sub update_item {
2781 my ($self) = @_;
2782
2783 my $desc = _item_to_desc ($self->{item});
2784
2785 $self->{name_lbl}->set_text ($desc);
2486} 2786}
2487 2787
2488############################################################################# 2788#############################################################################
2489 2789
2490package CFClient::UI::Inventory; 2790package CFClient::UI::Inventory;
… …
2493 2793
2494sub new { 2794sub new {
2495 my $class = shift; 2795 my $class = shift;
2496 2796
2497 my $self = $class->SUPER::new ( 2797 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox), 2798 scrolled => (new CFClient::UI::Table),
2499 @_, 2799 @_,
2500 ); 2800 );
2501 2801
2502 $self 2802 $self
2503} 2803}
… …
2506 my ($self, $items) = @_; 2806 my ($self, $items) = @_;
2507 2807
2508 $self->{scrolled}->clear; 2808 $self->{scrolled}->clear;
2509 return unless $items; 2809 return unless $items;
2510 2810
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2811 my @items = sort {
2812 ($a->{type} <=> $b->{type})
2813 or ($a->{name} cmp $b->{name})
2814 } @$items;
2512 2815
2513 $self->{real_items} = \@items; 2816 $self->{real_items} = \@items;
2514 2817
2515 for my $item (@items) { 2818 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2 2819 $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); 2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2822 }
2823
2824 my $i = 0;
2825 for (@items) {
2826 $self->{scrolled}->add (0, $i, $_);
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2521 } 2829 }
2522 2830
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524} 2832}
2525 2833
… …
2604 2912
2605package CFClient::UI::Statusbox; 2913package CFClient::UI::Statusbox;
2606 2914
2607our @ISA = CFClient::UI::VBox::; 2915our @ISA = CFClient::UI::VBox::;
2608 2916
2917sub new {
2918 my $class = shift;
2919
2920 $class->SUPER::new (
2921 fontsize => 0.8,
2922 @_,
2923 )
2924}
2925
2609sub reorder { 2926sub reorder {
2610 my ($self) = @_; 2927 my ($self) = @_;
2611 my $NOW = time; 2928 my $NOW = time;
2612 2929
2613 while (my ($k, $v) = each %{ $self->{item} }) { 2930 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2948 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2949 : $item->{text};
2633 2950
2634 for ($short) { 2951 for ($short) {
2635 s/^\s+//; 2952 s/^\s+//;
2636 s/\012.*/…/s; 2953 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2954 }
2640 2955
2641 new CFClient::UI::Label 2956 new CFClient::UI::Label
2642 markup => $short, 2957 markup => $short,
2643 tooltip => $item->{tooltip}, 2958 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2959 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2960 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2961 fontsize => $item->{fontsize} || $self->{fontsize},
2962 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2963 fg => $item->{fg},
2648 can_events => 1, 2964 can_events => 1,
2649 can_hover => 1 2965 can_hover => 1
2650 }; 2966 };
2651 } 2967 }
2652 2968
… …
2654 $self->SUPER::add (reverse @widgets); 2970 $self->SUPER::add (reverse @widgets);
2655} 2971}
2656 2972
2657sub add { 2973sub add {
2658 my ($self, $text, %arg) = @_; 2974 my ($self, $text, %arg) = @_;
2975
2976 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//;
2659 2978
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 2979 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 2980
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 2982
… …
2666 $item->{count}++; 2985 $item->{count}++;
2667 } else { 2986 } else {
2668 $item->{count} = 1; 2987 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 2988 $item->{text} = $item->{tooltip} = $text;
2670 } 2989 }
2990 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 2991 $item->{timeout} = $timeout;
2672 delete $item->{label}; 2992 delete $item->{label};
2673 } else { 2993 } else {
2674 $self->{item}{$group} = { 2994 $self->{item}{$group} = {
2675 id => ++$self->{id}, 2995 id => ++$self->{id},
2676 text => $text, 2996 text => $text,
2677 timeout => $timeout, 2997 timeout => $timeout,
2678 tooltip => $text, 2998 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 2999 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 3000 pri => 0,
2682 count => 1, 3001 count => 1,
2683 %arg, 3002 %arg,
2684 }; 3003 };
2685 } 3004 }
2686 3005
2687 $self->reorder; 3006 $self->reorder;
2688} 3007}
2689 3008
3009sub reconfigure {
3010 my ($self) = @_;
3011
3012 delete $_->{label}
3013 for values %{ $self->{item} || {} };
3014
3015 $self->reorder;
3016 $self->SUPER::reconfigure;
3017}
3018
2690############################################################################# 3019#############################################################################
2691 3020
2692package CFClient::UI::Root; 3021package CFClient::UI::Root;
2693 3022
2694our @ISA = CFClient::UI::Container::; 3023our @ISA = CFClient::UI::Container::;
… …
2724} 3053}
2725 3054
2726sub size_allocate { 3055sub size_allocate {
2727 my ($self, $w, $h) = @_; 3056 my ($self, $w, $h) = @_;
2728 3057
2729 my $old_w = $self->{old_w}; 3058 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2730 my $old_h = $self->{old_h}; 3059 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2731 3060
2732 if ($old_w && $old_h) { 3061 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2733 for my $child ($self->children) { 3062 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 3063
2745 for my $child ($self->children) { 3064 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3065 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 3066
3067 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3068 if exists $child->{req_x};
3069
3070 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3071 if exists $child->{req_y};
3072
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3073 $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; 3074 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3075
2750 $child->configure ($X, $Y, $W, $H); 3076 $child->configure ($X, $Y, $W, $H);
2751 } 3077 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 3078}
2756 3079
2757sub coord2local { 3080sub coord2local {
2758 my ($self, $x, $y) = @_; 3081 my ($self, $x, $y) = @_;
2759 3082
… …
2772 $self->check_size; 3095 $self->check_size;
2773 $::WANT_REFRESH++; 3096 $::WANT_REFRESH++;
2774} 3097}
2775 3098
2776sub add { 3099sub add {
2777 my ($self, $child) = @_; 3100 my ($self, @children) = @_;
2778 3101
3102 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children;
3104 $w->{root} = $self;
3105 $w->{visible} = 1;
3106 }
3107
3108 for my $child (@children) {
3109 $child->{toplevel} = 1;
3110
2779 # integerise window positions 3111 # integerise window positions
2780 $child->{x} = int $child->{x}; 3112 $child->{x} = int $child->{x};
2781 $child->{y} = int $child->{y}; 3113 $child->{y} = int $child->{y};
3114 }
2782 3115
2783 $self->SUPER::add ($child); 3116 $self->SUPER::add (@children);
3117}
3118
3119sub remove {
3120 my ($self, @children) = @_;
3121
3122 $self->SUPER::remove (@children);
3123
3124 while (@children) {
3125 my $w = pop @children;
3126 push @children, $w->children;
3127 delete $w->{visible};
3128 }
2784} 3129}
2785 3130
2786sub on_refresh { 3131sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3132 my ($self, $id, $cb) = @_;
2788 3133
2789 $self->{refresh_hook}{$id} = $cb; 3134 $self->{refresh_hook}{$id} = $cb;
2790} 3135}
2791 3136
3137sub on_post_alloc {
3138 my ($self, $id, $cb) = @_;
3139
3140 $self->{post_alloc_hook}{$id} = $cb;
3141}
3142
2792sub draw { 3143sub draw {
2793 my ($self) = @_; 3144 my ($self) = @_;
3145
3146 while ($self->{refresh_hook}) {
3147 $_->()
3148 for values %{delete $self->{refresh_hook}};
3149 }
2794 3150
2795 if ($self->{check_size}) { 3151 if ($self->{check_size}) {
2796 my @queue = ([], []); 3152 my @queue = ([], []);
2797 3153
2798 for (;;) { 3154 for (;;) {
… …
2835 $widget->size_allocate ($w, $h); 3191 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h); 3192 $widget->emit (size_allocate => $w, $h);
2837 } 3193 }
2838 } 3194 }
2839 3195
2840 while ($self->{refresh_hook}) { 3196 while ($self->{post_alloc_hook}) {
2841 $_->() 3197 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3198 for values %{delete $self->{post_alloc_hook}};
2843 } 3199 }
2844 3200
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3201 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3203 glClear GL_COLOR_BUFFER_BIT;
2848 3204
2849 glMatrixMode GL_PROJECTION; 3205 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3206 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3208 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3209 glLoadIdentity;
2854 3210
2855 $self->_draw; 3211 $self->_draw;
2856} 3212}
… …
2858############################################################################# 3214#############################################################################
2859 3215
2860package CFClient::UI; 3216package CFClient::UI;
2861 3217
2862$ROOT = new CFClient::UI::Root; 3218$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3219$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3220
28651 32211
2866 3222

Diff Legend

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