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.170 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.201 by root, Sat May 13 23:17:49 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
247sub 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 (1);
258 $self->update;
259}
260
241sub set_max_size { 261sub set_max_size {
242 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
243 263
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
246}
247
248# return top left coordinates
249sub _topleft {
250 my ($self, $x, $y) = @_;
251
252 $self->{parent}
253 or Carp::confess "no parent widget in _topleft\n";#d#
254
255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
256} 266}
257 267
258# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
259sub coord2local { 269sub coord2local {
260 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
261 271
262 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 273}
265 274
266# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
267sub coord2global { 276sub coord2global {
268 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
269 278
270 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 280}
273 281
274sub focus_in { 282sub focus_in {
275 my ($self) = @_; 283 my ($self) = @_;
276 284
… …
374 382
375sub set_parent { 383sub set_parent {
376 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
377 385
378 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};
379} 391}
380 392
381sub check_size { 393sub check_size {
382 my ($self) = @_; 394 my ($self, $forced) = @_;
383 395
384 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
385 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
386
387 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)}
389 : $self->size_request;
390
391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
392 $self->{req_w} = $w;
393 $self->{req_h} = $h;
394
395 $self->{parent}->check_size
396 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h),
399 );
400
401 1
402 } else {
403 0
404 }
405} 398}
406 399
407sub update { 400sub update {
408 my ($self) = @_; 401 my ($self) = @_;
409 402
… …
506 499
507 $self 500 $self
508} 501}
509 502
510sub add { 503sub add {
511 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
512 505
513 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
514 508
515 use sort 'stable'; 509 use sort 'stable';
516 510
517 $self->{children} = [ 511 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
520 ]; 514 ];
521 515
522 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
523} 522}
524 523
525sub remove { 524sub remove {
526 my ($self, $child) = @_; 525 my ($self, $child) = @_;
527 526
… …
542 541
543 for (@$children) { 542 for (@$children) {
544 delete $_->{parent}; 543 delete $_->{parent};
545 $_->hide; 544 $_->hide;
546 } 545 }
546
547 $self->check_size;
548 $self->update;
547} 549}
548 550
549sub find_widget { 551sub find_widget {
550 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
551 553
… …
626} 628}
627 629
628sub update { 630sub update {
629 my ($self) = @_; 631 my ($self) = @_;
630 632
631 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 634 $self->SUPER::update;
634}
635
636sub render_chld {
637 my ($self) = @_;
638
639 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
640 glClearColor 0, 0, 0, 1;
641 glClear GL_COLOR_BUFFER_BIT;
642 $self->child->draw;
643 };
644} 635}
645 636
646sub size_allocate { 637sub size_allocate {
647 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
648 639
649 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
650 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
651 $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 };
652} 664}
653 665
654sub _draw { 666sub _draw {
655 my ($self) = @_; 667 my ($self) = @_;
656 668
657 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
658 670
659 my $tex = $self->{texture} 671 my $tex = $self->{texture}
660 or return; 672 or return;
661 673
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
665 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;
666 677
667 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668 679
669 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
671} 681}
672 682
673############################################################################# 683#############################################################################
674 684
675package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
676 686
677our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
678 688
679sub new { die }
680
681sub size_request { 689sub size_request {
682 my ($self) = @_; 690 my ($self) = @_;
683 691
684 @$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)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
686 694
687 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
688} 696}
689 697
690sub _draw { 698sub size_allocate {
691 my ($self) = @_; 699 my ($self, $w, $h) = @_;
692 700
693 $self->{children}[1]->draw; 701 $self->update;
694} 702}
695 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
696 706
697############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
698 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
699package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
700 752
701our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
702
703use CFClient::OpenGL;
704 754
705sub new { 755sub new {
706 my $class = shift; 756 my $class = shift;
707 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
708 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
709 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
710 border_bg => [1, 1, 1, 1], 770 slider => $slider,
711 border => 0.8,
712 @_ 771 @_,
713 ); 772 );
714 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
715 $self 778 $self
716} 779}
717 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
718sub _draw { 801sub _draw {
719 my ($self) = @_; 802 my ($self) = @_;
720 803
721 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
722 806
723 glEnable GL_BLEND; 807 glEnable GL_BLEND;
724 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
725 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
726 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727 810
728# glBegin GL_QUADS; 811 glBegin GL_QUADS;
729# glColor 0, 0, 0, 0;
730# glVertex 0 , 0; 812 glVertex 0 , 0;
731# glVertex 0 , $h; 813 glVertex 0 , $h;
732# glVertex $w, $h; 814 glVertex $w, $h;
733# glVertex $w, 0; 815 glVertex $w, 0;
734# glEnd; 816 glEnd;
735 817
736
737 $self->child->draw;
738 glDisable GL_BLEND; 818 glDisable GL_BLEND;
739 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
740} 822}
741 823
742############################################################################# 824#############################################################################
743 825
744package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
757 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
758 840
759 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
762 border => 0.8, 844 border => 0.6,
763 can_events => 1, 845 can_events => 1,
764 @_ 846 @_
765 ); 847 );
766 848
767 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 850 align => 0,
769 valign => 1, 851 valign => 1,
770 text => $self->{title}, 852 text => $self->{title},
771 fontsize => 1; 853 fontsize => $self->{border};
772 854
773 $self 855 $self
774} 856}
775 857
776sub border { 858sub border {
… …
801} 883}
802 884
803sub button_down { 885sub button_down {
804 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
805 887
888 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 889 my $border = $self->border;
807 890
808 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
813 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
814 $self->{motion} = sub { 902 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
816 904
817 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
818 907
819 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 911 $self->check_size;
822 }; 912 };
823 913
824 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
829 917
830 $self->{motion} = sub { 918 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
854 my ($self) = @_; 942 my ($self) = @_;
855 943
856 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
857 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858 946
859 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863 949
864 my $border = $self->border; 950 my $border = $self->border;
865 951
866 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
867 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
871 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 959 my $bg = $tex[0];
873 960
874 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
877 964
878 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
879 966
880 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
884 972
885 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND;
887 974
888 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
889 $self->child->draw; 977 $self->child->draw;
890} 978}
891 979
892############################################################################# 980#############################################################################
893 981
… …
915 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
916 1004
917 $child->check_size; 1005 $child->check_size;
918} 1006}
919 1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
920# TODO: move to container class maybe? send childs a signal on removal? 1012# TODO: move to container class maybe? send childs a signal on removal?
921sub clear { 1013sub clear {
922 my ($self) = @_; 1014 my ($self) = @_;
923 1015
924 my $children = delete $self->{children}; 1016 my @children = $self->children;
1017 delete $self->{children};
925 1018
926 for (grep $_, map @$_, grep $_, @$children) { 1019 for (@children) {
927 delete $_->{parent}; 1020 delete $_->{parent};
928 $_->hide; 1021 $_->hide;
929 } 1022 }
930 1023
931 $self->update; 1024 $self->update;
… …
1112} 1205}
1113 1206
1114sub size_allocate { 1207sub size_allocate {
1115 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1116 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1117 my $children = $self->{children}; 1212 my $children = $self->{children};
1118 1213
1119 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1120 1215
1121 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1160 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1161 1256
1162 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1163 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1164 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1165 fontsize => 1, 1263 fontsize => 1,
1166 text => "",
1167 align => -1, 1264 align => -1,
1168 valign => -1, 1265 valign => -1,
1169 padding => 2, 1266 padding => 2,
1170 layout => new CFClient::Layout,
1171 can_events => 0, 1267 can_events => 0,
1172 %arg 1268 %arg
1173 ); 1269 );
1174 1270
1175 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1176 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1177 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1178 $self->{template} = $layout; 1274 $self->{template} = $layout;
1179 } 1275 }
1180 1276
1181 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1182 $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 }
1183 1282
1184 $self 1283 $self
1185} 1284}
1186 1285
1187sub escape { 1286sub escape {
… …
1192 s/</&lt;/g; 1291 s/</&lt;/g;
1193 1292
1194 $_[1] 1293 $_[1]
1195} 1294}
1196 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1197sub set_text { 1303sub set_text {
1198 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1199 1305
1306 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text";
1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1200 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1201 1311
1202 delete $self->{texture}; 1312 $self->update;
1203 $self->check_size; 1313 $self->check_size;
1204 $self->update;
1205} 1314}
1206 1315
1207sub set_markup { 1316sub set_markup {
1208 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1209 1318
1319 return if $self->{text} eq "M$markup";
1320 $self->{text} = "M$markup";
1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1210 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1211 1326
1212 delete $self->{texture}; 1327 $self->update;
1213 $self->check_size; 1328 $self->check_size;
1214 $self->update;
1215} 1329}
1216 1330
1217sub size_request { 1331sub size_request {
1218 my ($self) = @_; 1332 my ($self) = @_;
1219 1333
… …
1248sub set_fontsize { 1362sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1250 1364
1251 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1253 $self->check_size; 1369 $self->check_size;
1254 $self->update;
1255} 1370}
1256 1371
1257sub _draw { 1372sub _draw {
1258 my ($self) = @_; 1373 my ($self) = @_;
1259 1374
1260 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1263 $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
1264 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
1265 }; 1392 };
1266 1393
1267 glEnable GL_BLEND;
1268 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271 1396
1397 if ($tex->{format} == GL_ALPHA) {
1272 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1273
1274 $self->{ox} = int (
1275 $self->{align} < 0 ? $self->{padding}
1276 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1277 : ($self->{w} - $tex->{w}) * 0.5
1278 );
1279
1280 $self->{oy} = int (
1281 $self->{valign} < 0 ? $self->{padding}
1282 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1283 : ($self->{h} - $tex->{h}) * 0.5
1284 );
1285
1286 $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 }
1287 1403
1288 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1289 glDisable GL_BLEND;
1290} 1405}
1291 1406
1292############################################################################# 1407#############################################################################
1293 1408
1294package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1329 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1330 1445
1331 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1332} 1447}
1333 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
1334sub get_text { 1458sub get_text {
1335 $_[0]{text} 1459 $_[0]{text}
1336} 1460}
1337 1461
1338sub size_request { 1462sub size_request {
… …
1345 1469
1346sub size_allocate { 1470sub size_allocate {
1347 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1348 1472
1349 $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
1350}
1351
1352sub set_text {
1353 my ($self, $text) = @_;
1354
1355 $self->{cursor} = length $text;
1356 $self->_set_text ($text);
1357 $self->update;
1358} 1474}
1359 1475
1360sub key_down { 1476sub key_down {
1361 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1362 1478
… …
1364 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1365 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1366 1482
1367 my $text = $self->get_text; 1483 my $text = $self->get_text;
1368 1484
1369 if ($sym == 8) { 1485 if ($uni == 8) {
1370 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1371 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1372 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1373 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1374 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1375 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1376 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1377 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1378 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1379 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1380 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1381 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1382 $self->emit ('escape'); 1498 $self->emit ('escape');
1383 } elsif ($uni) { 1499 } elsif ($uni) {
1384 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1385 } 1501 }
1386 1502
… …
1550 1666
1551 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1552 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1553 } 1669 }
1554 1670
1555 glEnable GL_BLEND;
1556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1560 1674
1561 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562 1676
1563 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1564 glDisable GL_BLEND;
1565 1678
1566 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1567} 1680}
1568 1681
1569############################################################################# 1682#############################################################################
… …
1616 1729
1617 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;
1618 1731
1619 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620 1733
1621 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1622 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1623 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1624
1625 my $tex = $self->{state} ? $tex[1] : $tex[0];
1626
1627 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1630 glDisable GL_BLEND;
1631} 1739}
1632 1740
1633############################################################################# 1741#############################################################################
1634 1742
1635package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1678 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1679 1787
1680 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1681 } 1789 }
1682 1790
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687 1793
1688 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1689 1795
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1692} 1797}
1693 1798
1694############################################################################# 1799#############################################################################
1695 1800
… …
1743} 1848}
1744 1849
1745sub set_max { 1850sub set_max {
1746 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1747 1852
1853 return if $self->{max_val} == $max;
1854
1748 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1749} 1857}
1750 1858
1751sub set_value { 1859sub set_value {
1752 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1753 1861
1754 $self->set_max ($max) 1862 $self->set_max ($max)
1755 if defined $max; 1863 if defined $max;
1756 1864
1757 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1758 $self->{val} = $val; 1867 $self->{val} = $val;
1759
1760 $self->update; 1868 $self->update;
1761} 1869}
1762 1870
1763sub _draw { 1871sub _draw {
1764 my ($self) = @_; 1872 my ($self) = @_;
… …
1827 1935
1828sub new { 1936sub new {
1829 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1830 1938
1831 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
1832 tooltip => $arg{type}, 1940 tooltip => $arg{type},
1833 can_hover => 1, 1941 can_hover => 1,
1942 can_events => 1,
1834 %arg, 1943 %arg,
1835 ); 1944 );
1836 1945
1837 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1946 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1838 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1947 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1846 1955
1847 $self->{value}->set_fontsize ($fsize); 1956 $self->{value}->set_fontsize ($fsize);
1848 $self->{max} ->set_fontsize ($fsize); 1957 $self->{max} ->set_fontsize ($fsize);
1849} 1958}
1850 1959
1960sub set_max {
1961 my ($self, $max) = @_;
1962
1963 $self->{gauge}->set_max ($max);
1964 $self->{max}->set_text ($max);
1965}
1966
1851sub set_value { 1967sub set_value {
1852 my ($self, $val, $max) = @_; 1968 my ($self, $val, $max) = @_;
1853 1969
1854 $self->set_max ($max) 1970 $self->set_max ($max)
1855 if defined $max; 1971 if defined $max;
1856 1972
1857 $self->{gauge}->set_value ($val, $max); 1973 $self->{gauge}->set_value ($val, $max);
1858 $self->{value}->set_text ($val); 1974 $self->{value}->set_text ($val);
1859}
1860
1861sub set_max {
1862 my ($self, $max) = @_;
1863
1864 $self->{gauge}->set_max ($max);
1865 $self->{max}->set_text ($max);
1866} 1975}
1867 1976
1868############################################################################# 1977#############################################################################
1869 1978
1870package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
… …
1889 # TODO: calculations are off 1998 # TODO: calculations are off
1890 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1891 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1892 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1893 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1894 req_w => 20, 2003 req_w => $::WIDTH / 80,
1895 req_h => 20, 2004 req_h => $::WIDTH / 80,
1896 vertical => 0, 2005 vertical => 0,
1897 can_hover => 1, 2006 can_hover => 1,
1898 inner_pad => 5, 2007 inner_pad => 5,
1899 @_ 2008 @_
1900 ); 2009 );
… …
1983 $page ||= 2; 2092 $page ||= 2;
1984 2093
1985 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1986 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1987 2096
1988 glEnable GL_BLEND;
1989 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1990 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1992 2099
1993 # draw background 2100 # draw background
1994 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1995 2102
1996 # draw handle 2103 # draw handle
1997 $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);
1998 2105
1999 glDisable GL_BLEND;
2000 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
2001} 2107}
2002 2108
2003############################################################################# 2109#############################################################################
2004 2110
… …
2015 fontsize => 1, 2121 fontsize => 1,
2016 can_events => 0, 2122 can_events => 0,
2017 #font => default_font 2123 #font => default_font
2018 @_, 2124 @_,
2019 2125
2020 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
2021 par => [], 2127 par => [],
2022 height => 0, 2128 height => 0,
2023 children => [ 2129 children => [
2024 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
2025 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
2026 ], 2132 ],
2027 ); 2133 );
2028 2134
2029 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
2030 $self->update;
2031 });
2032 2136
2033 $self 2137 $self
2034} 2138}
2035 2139
2036sub set_fontsize { 2140sub set_fontsize {
… …
2044 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
2045 2149
2046 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
2047 2151
2048 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2049 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
2050 $layout->set_text ($text); 2154 $layout->set_markup ($text);
2051 2155
2052 ($layout->size)[1] 2156 ($layout->size)[1]
2053} 2157}
2054 2158
2055sub reflow { 2159sub reflow {
… …
2093 2197
2094 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2095 2199
2096 delete $self->{texture}; 2200 delete $self->{texture};
2097 2201
2098 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2099 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2100 my $height = 0; 2204 my $height = 0;
2101 2205
2102 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2103 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2107 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2108 2212
2109 delete $self->{texture}; 2213 delete $self->{texture};
2110 } 2214 }
2111 2215
2112 $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 {
2113 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
2114 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2115 2219
2116 glEnable GL_BLEND;
2117 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2118 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120 2222
2121 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2122 2224
… …
2131 2233
2132 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2133 my $h = $par->[0]; 2235 my $h = $par->[0];
2134 2236
2135 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2136 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2137 2240
2138 glColor @{ $par->[1] };
2139 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2140 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);
2141 } 2243 }
2142 2244
2143 $y += $h; 2245 $y += $h;
2144 } 2246 }
2145 2247
2146 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2147 glDisable GL_BLEND;
2148 }; 2249 };
2149 }); 2250 });
2150} 2251}
2151 2252
2152sub _draw { 2253sub _draw {
2153 my ($self) = @_; 2254 my ($self) = @_;
2154 2255
2155 if ($self->{texture}) {
2156 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2258 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2159 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2160 }
2161 2261
2162 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2163 2263
2164} 2264}
2165 2265
… …
2259 @_, 2359 @_,
2260 can_events => 0, 2360 can_events => 0,
2261 ) 2361 )
2262} 2362}
2263 2363
2264sub set_markup { 2364sub set_tooltip_from {
2265 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2266 2366
2267 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2268 $self->{label}->set_markup ($text); 2368 markup => $widget->{tooltip},
2269 $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 );
2270} 2374}
2271 2375
2272sub size_request { 2376sub size_request {
2273 my ($self) = @_; 2377 my ($self) = @_;
2274
2275 $self->child->set_max_size ($::WIDTH * 0.3);
2276 2378
2277 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2278 2380
2279 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2280} 2382}
… …
2286} 2388}
2287 2389
2288sub _draw { 2390sub _draw {
2289 my ($self) = @_; 2391 my ($self) = @_;
2290 2392
2291 glPushMatrix;
2292 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2293 2394
2294 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2295 2396
2296 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2307 glVertex 0 , $h; 2408 glVertex 0 , $h;
2308 glVertex $w, $h; 2409 glVertex $w, $h;
2309 glVertex $w, 0; 2410 glVertex $w, 0;
2310 glEnd; 2411 glEnd;
2311 2412
2312 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2313
2314 glTranslate 2, 2;
2315 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2316} 2415}
2317 2416
2318############################################################################# 2417#############################################################################
2319 2418
… …
2334 2433
2335sub size_request { 2434sub size_request {
2336 (32, 8) 2435 (32, 8)
2337} 2436}
2338 2437
2339sub draw { 2438sub _draw {
2340 my ($self) = @_; 2439 my ($self) = @_;
2341 2440
2441 return unless $::CONN;#d# manage and cache textures differently
2342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2343 2443
2444 # TODO animation
2344 if ($tex) { 2445 if ($tex) {
2345 glEnable GL_BLEND;
2346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347 glEnable GL_TEXTURE_2D; 2446 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2448 glColor 1, 1, 1, 1;
2350 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2351 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2352 glDisable GL_BLEND;
2353 } 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 {
2544 ($a->{type} <=> $b->{type})
2545 or ($a->{name} cmp $b->{name})
2546 } @$items;
2547
2548 $self->{real_items} = \@items;
2549
2550 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2556 }
2557
2558 $self->{scrolled}->add (@items);
2559
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566}
2567
2568#############################################################################
2569
2570package CFClient::UI::Menu;
2571
2572our @ISA = CFClient::UI::FancyFrame::;
2573
2574use CFClient::OpenGL;
2575
2576sub new {
2577 my $class = shift;
2578
2579 my $self = $class->SUPER::new (
2580 items => [],
2581 z => 100,
2582 @_,
2583 );
2584
2585 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2586
2587 for my $item (@{ $self->{items} }) {
2588 my ($widget, $cb) = @$item;
2589
2590 # handle various types of items, only text for now
2591 if (!ref $widget) {
2592 $widget = new CFClient::UI::Label
2593 can_hover => 1,
2594 can_events => 1,
2595 text => $widget;
2596 }
2597
2598 $self->{item}{$widget} = $item;
2599
2600 $self->{vbox}->add ($widget);
2601 }
2602
2603 $self
2604}
2605
2606# popup given the event (must be a mouse button down event currently)
2607sub popup {
2608 my ($self, $ev) = @_;
2609
2610 $self->emit ("popdown");
2611
2612 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self;
2614 $self->{button} = $ev->{button};
2615
2616 $self->show;
2617 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2618}
2619
2620sub mouse_motion {
2621 my ($self, $ev, $x, $y) = @_;
2622
2623 # TODO: should use vbox->find_widget or so
2624 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2625 $self->{hover} = $self->{item}{$HOVER};
2626}
2627
2628sub button_up {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB;
2633 $self->hide;
2634
2635 $self->emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover};
2637 }
2638}
2639
2640#############################################################################
2641
2642package CFClient::UI::Statusbox;
2643
2644our @ISA = CFClient::UI::VBox::;
2645
2646sub reorder {
2647 my ($self) = @_;
2648 my $NOW = time;
2649
2650 while (my ($k, $v) = each %{ $self->{item} }) {
2651 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2652 }
2653
2654 my @widgets;
2655
2656 my @items = sort {
2657 $a->{pri} <=> $b->{pri}
2658 or $b->{id} <=> $a->{id}
2659 } values %{ $self->{item} };
2660
2661 my $count = 10 + 1;
2662 for my $item (@items) {
2663 last unless --$count;
2664
2665 push @widgets, $item->{label} ||= do {
2666 # TODO: doesn't handle markup well (read as: at all)
2667 my $short = $item->{count} > 1
2668 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text};
2670
2671 for ($short) {
2672 s/^\s+//;
2673 s/\012.*/…/s;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 }
2677
2678 new CFClient::UI::Label
2679 markup => $short,
2680 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize},
2684 color => $item->{color},
2685 can_events => 1,
2686 can_hover => 1
2687 };
2688 }
2689
2690 $self->clear;
2691 $self->SUPER::add (reverse @widgets);
2692}
2693
2694sub add {
2695 my ($self, $text, %arg) = @_;
2696
2697 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//;
2699
2700 my $timeout = time + ((delete $arg{timeout}) || 60);
2701
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703
2704 if (my $item = $self->{item}{$group}) {
2705 if ($item->{text} eq $text) {
2706 $item->{count}++;
2707 } else {
2708 $item->{count} = 1;
2709 $item->{text} = $item->{tooltip} = $text;
2710 }
2711 $item->{id} = ++$self->{id};
2712 $item->{timeout} = $timeout;
2713 delete $item->{label};
2714 } else {
2715 $self->{item}{$group} = {
2716 id => ++$self->{id},
2717 text => $text,
2718 timeout => $timeout,
2719 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0,
2723 count => 1,
2724 %arg,
2725 };
2726 }
2727
2728 $self->reorder;
2354} 2729}
2355 2730
2356############################################################################# 2731#############################################################################
2357 2732
2358package CFClient::UI::Root; 2733package CFClient::UI::Root;
2359 2734
2360our @ISA = CFClient::UI::Container::; 2735our @ISA = CFClient::UI::Container::;
2361 2736
2362use CFClient::OpenGL; 2737use CFClient::OpenGL;
2363 2738
2364sub check_size { 2739sub new {
2365 my ($self) = @_; 2740 my $class = shift;
2366 2741
2367 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2742 $class->SUPER::new (
2368} 2743 @_,
2369 2744 )
2370sub size_request {
2371 ($::WIDTH, $::HEIGHT)
2372} 2745}
2373 2746
2374sub configure { 2747sub configure {
2375 my ($self, $x, $y, $w, $h) = @_; 2748 my ($self, $x, $y, $w, $h) = @_;
2376 2749
2377 $self->SUPER::configure ($x, $y, $w, $h); 2750 $self->{w} = $w;
2751 $self->{h} = $h;
2752}
2378 2753
2754sub check_size {
2755 my ($self) = @_;
2756
2757 $self->size_allocate ($self->{w}, $self->{h})
2758 if $self->{w};
2759}
2760
2761sub size_request {
2762 my ($self) = @_;
2763
2764 ($self->{w}, $self->{h})
2765}
2766
2767sub size_allocate {
2768 my ($self, $w, $h) = @_;
2769
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785
2379 for my $child (@{$self->{children}}) { 2786 for my $child ($self->children) {
2380 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2787 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2381 2788
2382 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2789 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2383 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2384 $child->configure ($X, $Y, $W,$H); 2791 $child->configure ($X, $Y, $W, $H);
2385 } 2792 }
2386}
2387 2793
2388sub _topleft { 2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796}
2797
2798sub coord2local {
2389 my ($self, $x, $y) = @_; 2799 my ($self, $x, $y) = @_;
2390 2800
2391 ($x, $y) 2801 ($x, $y)
2392} 2802}
2393 2803
2804sub coord2global {
2805 my ($self, $x, $y) = @_;
2806
2807 ($x, $y)
2808}
2809
2394sub update { 2810sub update {
2395 my ($self) = @_; 2811 my ($self) = @_;
2396 2812
2397 $self->check_size; 2813 $self->check_size;
2398 ::refresh (); 2814 $::WANT_REFRESH++;
2399} 2815}
2400 2816
2401sub add { 2817sub add {
2402 my ($self, $child) = @_; 2818 my ($self, $child) = @_;
2403 2819
2404 # integerize window positions 2820 # integerise window positions
2405 $child->{x} = int $child->{x}; 2821 $child->{x} = int $child->{x};
2406 $child->{y} = int $child->{y}; 2822 $child->{y} = int $child->{y};
2407 2823
2408 $self->SUPER::add ($child); 2824 $self->SUPER::add ($child);
2409} 2825}
… …
2412 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2413 2829
2414 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2415} 2831}
2416 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2417sub draw { 2839sub draw {
2418 my ($self) = @_; 2840 my ($self) = @_;
2419 2841
2420 while (my $rcb = delete $self->{refresh_hook}) { 2842 while ($self->{refresh_hook}) {
2421 $_->() for values %$rcb; 2843 $_->()
2844 for values %{delete $self->{refresh_hook}};
2845 }
2846
2847 if ($self->{check_size}) {
2848 my @queue = ([], []);
2849
2850 for (;;) {
2851 if ($self->{check_size}) {
2852 # heuristic: check containers last
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2854 for values %{delete $self->{check_size}}
2855 }
2856
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2858
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2860 ? @$widget{qw(user_w user_h)}
2861 : $widget->size_request;
2862
2863 if (delete $widget->{force_alloc}
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2866
2867 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h;
2869
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2871
2872 $widget->{parent}->check_size
2873 if $widget->{parent};
2874 }
2875 }
2876 }
2877
2878 while ($self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) {
2880 my ($widget, $w, $h) = @$_;
2881
2882 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0;
2884
2885 $widget->{w} = $w;
2886 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h);
2888 $widget->emit (size_allocate => $w, $h);
2889 }
2890 }
2891
2892 while ($self->{post_alloc_hook}) {
2893 $_->()
2894 for values %{delete $self->{post_alloc_hook}};
2422 } 2895 }
2423 2896
2424 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2425 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2426 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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