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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.200 by root, Sat May 13 00:27:09 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_markup ($widget->{tooltip}); 29 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
31 } 41 }
32 42
33 return; 43 return;
34 } 44 }
35 } 45 }
… …
224 $self->{y} = $y; 234 $self->{y} = $y;
225 $self->update; 235 $self->update;
226 } 236 }
227 237
228 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 240 }
235} 241}
236 242
237sub size_allocate { 243sub size_allocate {
238 # nothing to be done 244 # nothing to be done
239} 245}
240 246
241sub children { 247sub children {
242} 248}
243 249
244# call when resoltuion changes etc. 250# call when resolution changes etc.
245sub reconfigure { 251sub reconfigure {
246 my ($self) = @_; 252 my ($self) = @_;
247 253
248 $_->reconfigure 254 $_->reconfigure
249 for $self->children; 255 for $self->children;
250 256
251 $_->check_size; 257 $self->check_size (1);
258 $self->update;
252} 259}
253 260
254sub set_max_size { 261sub set_max_size {
255 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
256 263
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
259}
260
261# return top left coordinates
262sub _topleft {
263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
267
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
269} 266}
270 267
271# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
272sub coord2local { 269sub coord2local {
273 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
274 271
275 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 273}
278 274
279# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
280sub coord2global { 276sub coord2global {
281 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
282 278
283 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 280}
286 281
287sub focus_in { 282sub focus_in {
288 my ($self) = @_; 283 my ($self) = @_;
289 284
… …
387 382
388sub set_parent { 383sub set_parent {
389 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
390 385
391 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
392} 391}
393 392
394sub check_size { 393sub check_size {
395 my ($self) = @_; 394 my ($self, $forced) = @_;
396 395
397 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
398 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 398}
419 399
420sub update { 400sub update {
421 my ($self) = @_; 401 my ($self) = @_;
422 402
… …
519 499
520 $self 500 $self
521} 501}
522 502
523sub add { 503sub add {
524 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
525 505
526 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
527 508
528 use sort 'stable'; 509 use sort 'stable';
529 510
530 $self->{children} = [ 511 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
533 ]; 514 ];
534 515
535 $child->check_size; 516 $self->check_size (1);
517 $self->update;
536} 518}
537 519
538sub children { 520sub children {
539 @{ $_[0]{children} } 521 @{ $_[0]{children} }
540} 522}
… …
559 541
560 for (@$children) { 542 for (@$children) {
561 delete $_->{parent}; 543 delete $_->{parent};
562 $_->hide; 544 $_->hide;
563 } 545 }
546
547 $self->check_size;
548 $self->update;
564} 549}
565 550
566sub find_widget { 551sub find_widget {
567 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
568 553
… …
643} 628}
644 629
645sub update { 630sub update {
646 my ($self) = @_; 631 my ($self) = @_;
647 632
648 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 634 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 635}
662 636
663sub size_allocate { 637sub size_allocate {
664 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
665 639
666 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
667 643
644sub _render {
645 $_[0]{children}[0]->draw;
646}
647
648sub render_child {
649 my ($self) = @_;
650
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT;
654
668 $self->render_chld; 655 $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 };
669} 664}
670 665
671sub _draw { 666sub _draw {
672 my ($self) = @_; 667 my ($self) = @_;
673 668
674 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
675 670
676 my $tex = $self->{texture} 671 my $tex = $self->{texture}
677 or return; 672 or return;
678 673
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1;
683 677
684 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 679
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
688} 681}
689 682
690############################################################################# 683#############################################################################
691 684
692package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
693 686
694our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
695 688
696sub new { die }
697
698sub size_request { 689sub size_request {
699 my ($self) = @_; 690 my ($self) = @_;
700 691
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
703 694
704 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
705} 696}
706 697
707sub _draw { 698sub size_allocate {
708 my ($self) = @_; 699 my ($self, $w, $h) = @_;
709 700
710 $self->{children}[1]->draw; 701 $self->update;
711} 702}
712 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
713 706
714############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
715 709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
716package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
717 752
718our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
719
720use CFClient::OpenGL;
721 754
722sub new { 755sub new {
723 my $class = shift; 756 my $class = shift;
724 757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
725 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
727 border_bg => [1, 1, 1, 1], 770 slider => $slider,
728 border => 0.8,
729 @_ 771 @_,
730 ); 772 );
731 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
732 $self 778 $self
733} 779}
734 780
781#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll
783
784#############################################################################
785
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use CFClient::OpenGL;
791
792sub new {
793 my $class = shift;
794
795 $class->SUPER::new (
796 bg => undef,
797 @_,
798 )
799}
800
735sub _draw { 801sub _draw {
736 my ($self) = @_; 802 my ($self) = @_;
737 803
738 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
739 806
740 glEnable GL_BLEND; 807 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 810
745# glBegin GL_QUADS; 811 glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0; 812 glVertex 0 , 0;
748# glVertex 0 , $h; 813 glVertex 0 , $h;
749# glVertex $w, $h; 814 glVertex $w, $h;
750# glVertex $w, 0; 815 glVertex $w, 0;
751# glEnd; 816 glEnd;
752 817
753
754 $self->child->draw;
755 glDisable GL_BLEND; 818 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
757} 822}
758 823
759############################################################################# 824#############################################################################
760 825
761package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
774 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
775 840
776 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
779 border => 0.8, 844 border => 0.6,
780 can_events => 1, 845 can_events => 1,
781 @_ 846 @_
782 ); 847 );
783 848
784 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 850 align => 0,
786 valign => 1, 851 valign => 1,
787 text => $self->{title}, 852 text => $self->{title},
788 fontsize => 1; 853 fontsize => $self->{border};
789 854
790 $self 855 $self
791} 856}
792 857
793sub border { 858sub border {
… …
818} 883}
819 884
820sub button_down { 885sub button_down {
821 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
822 887
888 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 889 my $border = $self->border;
824 890
825 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
830 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
831 $self->{motion} = sub { 902 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
833 904
834 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
835 907
836 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 911 $self->check_size;
839 }; 912 };
840 913
841 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
846 917
847 $self->{motion} = sub { 918 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
871 my ($self) = @_; 942 my ($self) = @_;
872 943
873 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 946
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 949
881 my $border = $self->border; 950 my $border = $self->border;
882 951
883 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 959 my $bg = $tex[0];
890 960
891 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
894 964
895 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
896 966
897 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
901 972
902 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 974
905 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
906 $self->child->draw; 977 $self->child->draw;
907} 978}
908 979
909############################################################################# 980#############################################################################
910 981
… …
1134} 1205}
1135 1206
1136sub size_allocate { 1207sub size_allocate {
1137 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1138 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1139 my $children = $self->{children}; 1212 my $children = $self->{children};
1140 1213
1141 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1142 1215
1143 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1182 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1183 1256
1184 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1186 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1187 fontsize => 1, 1263 fontsize => 1,
1188 text => "",
1189 align => -1, 1264 align => -1,
1190 valign => -1, 1265 valign => -1,
1191 padding => 2, 1266 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1267 can_events => 0,
1194 %arg 1268 %arg
1195 ); 1269 );
1196 1270
1197 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1274 $self->{template} = $layout;
1201 } 1275 }
1202 1276
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1278 $self->set_markup (delete $self->{markup});
1279 } else {
1280 $self->set_text (delete $self->{text});
1281 }
1205 1282
1206 $self 1283 $self
1207} 1284}
1208 1285
1209sub escape { 1286sub escape {
… …
1221 1298
1222 delete $self->{texture}; 1299 delete $self->{texture};
1223 $self->SUPER::update; 1300 $self->SUPER::update;
1224} 1301}
1225 1302
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1303sub set_text {
1233 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1234 1305
1235 return if $self->{text} eq "T$text"; 1306 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1307 $self->{text} = "T$text";
1237 1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1239 1311
1240 delete $self->{texture};
1241 $self->update; 1312 $self->update;
1242 $self->check_size; 1313 $self->check_size;
1243} 1314}
1244 1315
1245sub set_markup { 1316sub set_markup {
1246 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1247 1318
1248 return if $self->{text} eq "M$markup"; 1319 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1320 $self->{text} = "M$markup";
1250 1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1252 1326
1253 delete $self->{texture};
1254 $self->update; 1327 $self->update;
1255 $self->check_size; 1328 $self->check_size;
1256} 1329}
1257 1330
1258sub size_request { 1331sub size_request {
… …
1289sub set_fontsize { 1362sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1291 1364
1292 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1294 $self->check_size; 1369 $self->check_size;
1295 $self->update;
1296} 1370}
1297 1371
1298sub _draw { 1372sub _draw {
1299 my ($self) = @_; 1373 my ($self) = @_;
1300 1374
1301 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1380
1305 new_from_layout CFClient::Texture $self->{layout} 1381 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1306 }; 1392 };
1307 1393
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1396
1397 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy}); 1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1328 1403
1329 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1405}
1332 1406
1333############################################################################# 1407#############################################################################
1334 1408
1335package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1370 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1371 1445
1372 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1373} 1447}
1374 1448
1449sub set_text {
1450 my ($self, $text) = @_;
1451
1452 $self->{cursor} = length $text;
1453 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456}
1457
1375sub get_text { 1458sub get_text {
1376 $_[0]{text} 1459 $_[0]{text}
1377} 1460}
1378 1461
1379sub size_request { 1462sub size_request {
… …
1386 1469
1387sub size_allocate { 1470sub size_allocate {
1388 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1389 1472
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399} 1474}
1400 1475
1401sub key_down { 1476sub key_down {
1402 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1403 1478
… …
1405 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1407 1482
1408 my $text = $self->get_text; 1483 my $text = $self->get_text;
1409 1484
1410 if ($sym == 8) { 1485 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1498 $self->emit ('escape');
1424 } elsif ($uni) { 1499 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1501 }
1427 1502
… …
1591 1666
1592 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1594 } 1669 }
1595 1670
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1601 1674
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1676
1604 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1678
1607 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1608} 1680}
1609 1681
1610############################################################################# 1682#############################################################################
… …
1657 1729
1658 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1659 1731
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1733
1662 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1663 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1739}
1673 1740
1674############################################################################# 1741#############################################################################
1675 1742
1676package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1720 1787
1721 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1722 } 1789 }
1723 1790
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1793
1729 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1795
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1733} 1797}
1734 1798
1735############################################################################# 1799#############################################################################
1736 1800
… …
1934 # TODO: calculations are off 1998 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1938 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1939 req_w => 20, 2003 req_w => $::WIDTH / 80,
1940 req_h => 20, 2004 req_h => $::WIDTH / 80,
1941 vertical => 0, 2005 vertical => 0,
1942 can_hover => 1, 2006 can_hover => 1,
1943 inner_pad => 5, 2007 inner_pad => 5,
1944 @_ 2008 @_
1945 ); 2009 );
… …
2028 $page ||= 2; 2092 $page ||= 2;
2029 2093
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032 2096
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2099
2038 # draw background 2100 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2040 2102
2041 # draw handle 2103 # draw handle
2042 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2043 2105
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
2046} 2107}
2047 2108
2048############################################################################# 2109#############################################################################
2049 2110
… …
2060 fontsize => 1, 2121 fontsize => 1,
2061 can_events => 0, 2122 can_events => 0,
2062 #font => default_font 2123 #font => default_font
2063 @_, 2124 @_,
2064 2125
2065 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
2066 par => [], 2127 par => [],
2067 height => 0, 2128 height => 0,
2068 children => [ 2129 children => [
2069 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
2071 ], 2132 ],
2072 ); 2133 );
2073 2134
2074 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2136
2078 $self 2137 $self
2079} 2138}
2080 2139
2081sub set_fontsize { 2140sub set_fontsize {
… …
2089 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
2090 2149
2091 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
2092 2151
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
2095 $layout->set_text ($text); 2154 $layout->set_markup ($text);
2096 2155
2097 ($layout->size)[1] 2156 ($layout->size)[1]
2098} 2157}
2099 2158
2100sub reflow { 2159sub reflow {
… …
2138 2197
2139 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2140 2199
2141 delete $self->{texture}; 2200 delete $self->{texture};
2142 2201
2143 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2144 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2204 my $height = 0;
2146 2205
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2148 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153 2212
2154 delete $self->{texture}; 2213 delete $self->{texture};
2155 } 2214 }
2156 2215
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2158 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2160 2219
2161 glEnable GL_BLEND;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165 2222
2166 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2167 2224
… …
2176 2233
2177 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2235 my $h = $par->[0];
2179 2236
2180 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2181 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2182 2240
2183 glColor @{ $par->[1] };
2184 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2185 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2186 } 2243 }
2187 2244
2188 $y += $h; 2245 $y += $h;
2189 } 2246 }
2190 2247
2191 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND;
2193 }; 2249 };
2194 }); 2250 });
2195} 2251}
2196 2252
2197sub _draw { 2253sub _draw {
2198 my ($self) = @_; 2254 my ($self) = @_;
2199 2255
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2258 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2206 }
2207 2261
2208 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2209 2263
2210} 2264}
2211 2265
… …
2305 @_, 2359 @_,
2306 can_events => 0, 2360 can_events => 0,
2307 ) 2361 )
2308} 2362}
2309 2363
2310sub set_markup { 2364sub set_tooltip_from {
2311 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2312 2366
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2314 $self->{label}->set_markup ($text); 2368 markup => $widget->{tooltip},
2315 $self->add ($self->{label}); 2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8,
2371 fg => [0, 0, 0, 1],
2372 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 );
2316} 2374}
2317 2375
2318sub size_request { 2376sub size_request {
2319 my ($self) = @_; 2377 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2378
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2380
2325 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2326} 2382}
… …
2332} 2388}
2333 2389
2334sub _draw { 2390sub _draw {
2335 my ($self) = @_; 2391 my ($self) = @_;
2336 2392
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2339 2394
2340 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2341 2396
2342 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2408 glVertex 0 , $h;
2354 glVertex $w, $h; 2409 glVertex $w, $h;
2355 glVertex $w, 0; 2410 glVertex $w, 0;
2356 glEnd; 2411 glEnd;
2357 2412
2358 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2362} 2415}
2363 2416
2364############################################################################# 2417#############################################################################
2365 2418
… …
2380 2433
2381sub size_request { 2434sub size_request {
2382 (32, 8) 2435 (32, 8)
2383} 2436}
2384 2437
2385sub draw { 2438sub _draw {
2386 my ($self) = @_; 2439 my ($self) = @_;
2387 2440
2441 return unless $::CONN;#d# manage and cache textures differently
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389 2443
2444 # TODO animation
2390 if ($tex) { 2445 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2446 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2448 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 2451 }
2452}
2453
2454#############################################################################
2455
2456package CFClient::UI::InventoryItem;
2457
2458our @ISA = CFClient::UI::HBox::;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Menu;
2566
2567our @ISA = CFClient::UI::FancyFrame::;
2568
2569use CFClient::OpenGL;
2570
2571sub new {
2572 my $class = shift;
2573
2574 my $self = $class->SUPER::new (
2575 items => [],
2576 z => 100,
2577 @_,
2578 );
2579
2580 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2581
2582 for my $item (@{ $self->{items} }) {
2583 my ($widget, $cb) = @$item;
2584
2585 # handle various types of items, only text for now
2586 if (!ref $widget) {
2587 $widget = new CFClient::UI::Label
2588 can_hover => 1,
2589 can_events => 1,
2590 text => $widget;
2591 }
2592
2593 $self->{item}{$widget} = $item;
2594
2595 $self->{vbox}->add ($widget);
2596 }
2597
2598 $self
2599}
2600
2601# popup given the event (must be a mouse button down event currently)
2602sub popup {
2603 my ($self, $ev) = @_;
2604
2605 $self->emit ("popdown");
2606
2607 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self;
2609 $self->{button} = $ev->{button};
2610
2611 $self->show;
2612 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2613}
2614
2615sub mouse_motion {
2616 my ($self, $ev, $x, $y) = @_;
2617
2618 # TODO: should use vbox->find_widget or so
2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2620 $self->{hover} = $self->{item}{$HOVER};
2621}
2622
2623sub button_up {
2624 my ($self, $ev, $x, $y) = @_;
2625
2626 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB;
2628 $self->hide;
2629
2630 $self->emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover};
2632 }
2633}
2634
2635#############################################################################
2636
2637package CFClient::UI::Statusbox;
2638
2639our @ISA = CFClient::UI::VBox::;
2640
2641sub reorder {
2642 my ($self) = @_;
2643 my $NOW = time;
2644
2645 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 }
2648
2649 my @widgets;
2650
2651 my @items = sort {
2652 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} };
2655
2656 my $count = 10 + 1;
2657 for my $item (@items) {
2658 last unless --$count;
2659
2660 push @widgets, $item->{label} ||= do {
2661 # TODO: doesn't handle markup well (read as: at all)
2662 my $short = $item->{count} > 1
2663 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text};
2665
2666 for ($short) {
2667 s/^\s+//;
2668 s/\012.*/…/s;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 }
2672
2673 new CFClient::UI::Label
2674 markup => $short,
2675 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize},
2679 color => $item->{color},
2680 can_events => 1,
2681 can_hover => 1
2682 };
2683 }
2684
2685 $self->clear;
2686 $self->SUPER::add (reverse @widgets);
2687}
2688
2689sub add {
2690 my ($self, $text, %arg) = @_;
2691
2692 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//;
2694
2695 my $timeout = time + ((delete $arg{timeout}) || 60);
2696
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698
2699 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) {
2701 $item->{count}++;
2702 } else {
2703 $item->{count} = 1;
2704 $item->{text} = $item->{tooltip} = $text;
2705 }
2706 $item->{id} = ++$self->{id};
2707 $item->{timeout} = $timeout;
2708 delete $item->{label};
2709 } else {
2710 $self->{item}{$group} = {
2711 id => ++$self->{id},
2712 text => $text,
2713 timeout => $timeout,
2714 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0,
2718 count => 1,
2719 %arg,
2720 };
2721 }
2722
2723 $self->reorder;
2400} 2724}
2401 2725
2402############################################################################# 2726#############################################################################
2403 2727
2404package CFClient::UI::Root; 2728package CFClient::UI::Root;
2405 2729
2406our @ISA = CFClient::UI::Container::; 2730our @ISA = CFClient::UI::Container::;
2407 2731
2408use CFClient::OpenGL; 2732use CFClient::OpenGL;
2409 2733
2410sub check_size { 2734sub new {
2411 my ($self) = @_; 2735 my $class = shift;
2412 2736
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2737 $class->SUPER::new (
2414} 2738 @_,
2415 2739 )
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418} 2740}
2419 2741
2420sub configure { 2742sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 2743 my ($self, $x, $y, $w, $h) = @_;
2422 2744
2423 $self->SUPER::configure ($x, $y, $w, $h); 2745 $self->{w} = $w;
2746 $self->{h} = $h;
2747}
2424 2748
2749sub check_size {
2750 my ($self) = @_;
2751
2752 $self->size_allocate ($self->{w}, $self->{h})
2753 if $self->{w};
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758
2759 ($self->{w}, $self->{h})
2760}
2761
2762sub size_allocate {
2763 my ($self, $w, $h) = @_;
2764
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780
2425 for my $child (@{$self->{children}}) { 2781 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 2783
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2784 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430 $child->configure ($X, $Y, $W,$H); 2786 $child->configure ($X, $Y, $W, $H);
2431 } 2787 }
2432}
2433 2788
2434sub _topleft { 2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791}
2792
2793sub coord2local {
2435 my ($self, $x, $y) = @_; 2794 my ($self, $x, $y) = @_;
2436 2795
2437 ($x, $y) 2796 ($x, $y)
2438} 2797}
2439 2798
2799sub coord2global {
2800 my ($self, $x, $y) = @_;
2801
2802 ($x, $y)
2803}
2804
2440sub update { 2805sub update {
2441 my ($self) = @_; 2806 my ($self) = @_;
2442 2807
2443 $self->check_size; 2808 $self->check_size;
2444 ::refresh (); 2809 $::WANT_REFRESH++;
2445} 2810}
2446 2811
2447sub add { 2812sub add {
2448 my ($self, $child) = @_; 2813 my ($self, $child) = @_;
2449 2814
2450 # integerize window positions 2815 # integerise window positions
2451 $child->{x} = int $child->{x}; 2816 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 2817 $child->{y} = int $child->{y};
2453 2818
2454 $self->SUPER::add ($child); 2819 $self->SUPER::add ($child);
2455} 2820}
… …
2458 my ($self, $id, $cb) = @_; 2823 my ($self, $id, $cb) = @_;
2459 2824
2460 $self->{refresh_hook}{$id} = $cb; 2825 $self->{refresh_hook}{$id} = $cb;
2461} 2826}
2462 2827
2828sub on_post_alloc {
2829 my ($self, $id, $cb) = @_;
2830
2831 $self->{post_alloc_hook}{$id} = $cb;
2832}
2833
2463sub draw { 2834sub draw {
2464 my ($self) = @_; 2835 my ($self) = @_;
2465 2836
2466 while (my $rcb = delete $self->{refresh_hook}) { 2837 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 2838 $_->()
2839 for values %{delete $self->{refresh_hook}};
2840 }
2841
2842 if ($self->{check_size}) {
2843 my @queue = ([], []);
2844
2845 for (;;) {
2846 if ($self->{check_size}) {
2847 # heuristic: check containers last
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2849 for values %{delete $self->{check_size}}
2850 }
2851
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2853
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2855 ? @$widget{qw(user_w user_h)}
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861
2862 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h;
2864
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2866
2867 $widget->{parent}->check_size
2868 if $widget->{parent};
2869 }
2870 }
2871 }
2872
2873 while ($self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) {
2875 my ($widget, $w, $h) = @$_;
2876
2877 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0;
2879
2880 $widget->{w} = $w;
2881 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h);
2883 $widget->emit (size_allocate => $w, $h);
2884 }
2885 }
2886
2887 while ($self->{post_alloc_hook}) {
2888 $_->()
2889 for values %{delete $self->{post_alloc_hook}};
2468 } 2890 }
2469 2891
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2892 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 2894 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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