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.172 by root, Tue Apr 25 09:52:04 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
241sub children { 247sub children {
242} 248}
243 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
244sub set_max_size { 261sub set_max_size {
245 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
246 263
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
249}
250
251# return top left coordinates
252sub _topleft {
253 my ($self, $x, $y) = @_;
254
255 $self->{parent}
256 or Carp::confess "no parent widget in _topleft\n";#d#
257
258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
259} 266}
260 267
261# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
262sub coord2local { 269sub coord2local {
263 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
264 271
265 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 273}
268 274
269# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
270sub coord2global { 276sub coord2global {
271 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
272 278
273 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 280}
276 281
277sub focus_in { 282sub focus_in {
278 my ($self) = @_; 283 my ($self) = @_;
279 284
… …
377 382
378sub set_parent { 383sub set_parent {
379 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
380 385
381 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};
382} 391}
383 392
384sub check_size { 393sub check_size {
385 my ($self) = @_; 394 my ($self, $forced) = @_;
386 395
387 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
388 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408} 398}
409 399
410sub update { 400sub update {
411 my ($self) = @_; 401 my ($self) = @_;
412 402
… …
509 499
510 $self 500 $self
511} 501}
512 502
513sub add { 503sub add {
514 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
515 505
516 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
517 508
518 use sort 'stable'; 509 use sort 'stable';
519 510
520 $self->{children} = [ 511 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
523 ]; 514 ];
524 515
525 $child->check_size; 516 $self->check_size (1);
517 $self->update;
526} 518}
527 519
528sub children { 520sub children {
529 @{ $_[0]{children} } 521 @{ $_[0]{children} }
530} 522}
… …
549 541
550 for (@$children) { 542 for (@$children) {
551 delete $_->{parent}; 543 delete $_->{parent};
552 $_->hide; 544 $_->hide;
553 } 545 }
546
547 $self->check_size;
548 $self->update;
554} 549}
555 550
556sub find_widget { 551sub find_widget {
557 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
558 553
… …
633} 628}
634 629
635sub update { 630sub update {
636 my ($self) = @_; 631 my ($self) = @_;
637 632
638 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 634 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 635}
652 636
653sub size_allocate { 637sub size_allocate {
654 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
655 639
656 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
657 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
658 $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 };
659} 664}
660 665
661sub _draw { 666sub _draw {
662 my ($self) = @_; 667 my ($self) = @_;
663 668
664 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
665 670
666 my $tex = $self->{texture} 671 my $tex = $self->{texture}
667 or return; 672 or return;
668 673
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
672 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;
673 677
674 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 679
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
678} 681}
679 682
680############################################################################# 683#############################################################################
681 684
682package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
683 686
684our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
685 688
686sub new { die }
687
688sub size_request { 689sub size_request {
689 my ($self) = @_; 690 my ($self) = @_;
690 691
691 @$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)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
693 694
694 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
695} 696}
696 697
697sub _draw { 698sub size_allocate {
698 my ($self) = @_; 699 my ($self, $w, $h) = @_;
699 700
700 $self->{children}[1]->draw; 701 $self->update;
701} 702}
702 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
703 706
704############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
705 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
706package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
707 752
708our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
709
710use CFClient::OpenGL;
711 754
712sub new { 755sub new {
713 my $class = shift; 756 my $class = shift;
714 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
715 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
716 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
717 border_bg => [1, 1, 1, 1], 770 slider => $slider,
718 border => 0.8,
719 @_ 771 @_,
720 ); 772 );
721 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
722 $self 778 $self
723} 779}
724 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
725sub _draw { 801sub _draw {
726 my ($self) = @_; 802 my ($self) = @_;
727 803
728 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
729 806
730 glEnable GL_BLEND; 807 glEnable GL_BLEND;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 810
735# glBegin GL_QUADS; 811 glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0; 812 glVertex 0 , 0;
738# glVertex 0 , $h; 813 glVertex 0 , $h;
739# glVertex $w, $h; 814 glVertex $w, $h;
740# glVertex $w, 0; 815 glVertex $w, 0;
741# glEnd; 816 glEnd;
742 817
743
744 $self->child->draw;
745 glDisable GL_BLEND; 818 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
747} 822}
748 823
749############################################################################# 824#############################################################################
750 825
751package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
764 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
765 840
766 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
769 border => 0.8, 844 border => 0.6,
770 can_events => 1, 845 can_events => 1,
771 @_ 846 @_
772 ); 847 );
773 848
774 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 850 align => 0,
776 valign => 1, 851 valign => 1,
777 text => $self->{title}, 852 text => $self->{title},
778 fontsize => 1; 853 fontsize => $self->{border};
779 854
780 $self 855 $self
781} 856}
782 857
783sub border { 858sub border {
… …
808} 883}
809 884
810sub button_down { 885sub button_down {
811 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
812 887
888 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 889 my $border = $self->border;
814 890
815 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
820 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
821 $self->{motion} = sub { 902 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
823 904
824 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
825 907
826 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
828 $self->check_size; 911 $self->check_size;
829 }; 912 };
830 913
831 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
836 917
837 $self->{motion} = sub { 918 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
861 my ($self) = @_; 942 my ($self) = @_;
862 943
863 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 946
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 949
871 my $border = $self->border; 950 my $border = $self->border;
872 951
873 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
878 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
879 my $bg = $tex[0]; 959 my $bg = $tex[0];
880 960
881 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
883 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
884 964
885 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
886 966
887 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
891 972
892 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 974
895 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
896 $self->child->draw; 977 $self->child->draw;
897} 978}
898 979
899############################################################################# 980#############################################################################
900 981
… …
1124} 1205}
1125 1206
1126sub size_allocate { 1207sub size_allocate {
1127 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1128 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1129 my $children = $self->{children}; 1212 my $children = $self->{children};
1130 1213
1131 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1132 1215
1133 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1172 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1173 1256
1174 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1176 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1177 fontsize => 1, 1263 fontsize => 1,
1178 text => "",
1179 align => -1, 1264 align => -1,
1180 valign => -1, 1265 valign => -1,
1181 padding => 2, 1266 padding => 2,
1182 layout => new CFClient::Layout,
1183 can_events => 0, 1267 can_events => 0,
1184 %arg 1268 %arg
1185 ); 1269 );
1186 1270
1187 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1274 $self->{template} = $layout;
1191 } 1275 }
1192 1276
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1194 $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 }
1195 1282
1196 $self 1283 $self
1197} 1284}
1198 1285
1199sub escape { 1286sub escape {
… …
1204 s/</&lt;/g; 1291 s/</&lt;/g;
1205 1292
1206 $_[1] 1293 $_[1]
1207} 1294}
1208 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1209sub set_text { 1303sub set_text {
1210 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1211 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;
1212 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1213 1311
1214 delete $self->{texture}; 1312 $self->update;
1215 $self->check_size; 1313 $self->check_size;
1216 $self->update;
1217} 1314}
1218 1315
1219sub set_markup { 1316sub set_markup {
1220 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1221 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;
1222 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1223 1326
1224 delete $self->{texture}; 1327 $self->update;
1225 $self->check_size; 1328 $self->check_size;
1226 $self->update;
1227} 1329}
1228 1330
1229sub size_request { 1331sub size_request {
1230 my ($self) = @_; 1332 my ($self) = @_;
1231 1333
… …
1260sub set_fontsize { 1362sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1262 1364
1263 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1265 $self->check_size; 1369 $self->check_size;
1266 $self->update;
1267} 1370}
1268 1371
1269sub _draw { 1372sub _draw {
1270 my ($self) = @_; 1373 my ($self) = @_;
1271 1374
1272 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1275 $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
1276 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
1277 }; 1392 };
1278 1393
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1396
1397 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $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 }
1299 1403
1300 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1405}
1303 1406
1304############################################################################# 1407#############################################################################
1305 1408
1306package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1341 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1342 1445
1343 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1344} 1447}
1345 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
1346sub get_text { 1458sub get_text {
1347 $_[0]{text} 1459 $_[0]{text}
1348} 1460}
1349 1461
1350sub size_request { 1462sub size_request {
… …
1357 1469
1358sub size_allocate { 1470sub size_allocate {
1359 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1360 1472
1361 $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
1362}
1363
1364sub set_text {
1365 my ($self, $text) = @_;
1366
1367 $self->{cursor} = length $text;
1368 $self->_set_text ($text);
1369 $self->update;
1370} 1474}
1371 1475
1372sub key_down { 1476sub key_down {
1373 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1374 1478
… …
1376 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1378 1482
1379 my $text = $self->get_text; 1483 my $text = $self->get_text;
1380 1484
1381 if ($sym == 8) { 1485 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1498 $self->emit ('escape');
1395 } elsif ($uni) { 1499 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1501 }
1398 1502
… …
1562 1666
1563 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1565 } 1669 }
1566 1670
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1572 1674
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1676
1575 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1678
1578 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1579} 1680}
1580 1681
1581############################################################################# 1682#############################################################################
… …
1628 1729
1629 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;
1630 1731
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1733
1633 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1634 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1739}
1644 1740
1645############################################################################# 1741#############################################################################
1646 1742
1647package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1691 1787
1692 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1693 } 1789 }
1694 1790
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1793
1700 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1795
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1704} 1797}
1705 1798
1706############################################################################# 1799#############################################################################
1707 1800
… …
1755} 1848}
1756 1849
1757sub set_max { 1850sub set_max {
1758 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1759 1852
1853 return if $self->{max_val} == $max;
1854
1760 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1761} 1857}
1762 1858
1763sub set_value { 1859sub set_value {
1764 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1765 1861
1766 $self->set_max ($max) 1862 $self->set_max ($max)
1767 if defined $max; 1863 if defined $max;
1768 1864
1769 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1770 $self->{val} = $val; 1867 $self->{val} = $val;
1771
1772 $self->update; 1868 $self->update;
1773} 1869}
1774 1870
1775sub _draw { 1871sub _draw {
1776 my ($self) = @_; 1872 my ($self) = @_;
… …
1859 1955
1860 $self->{value}->set_fontsize ($fsize); 1956 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 1957 $self->{max} ->set_fontsize ($fsize);
1862} 1958}
1863 1959
1960sub set_max {
1961 my ($self, $max) = @_;
1962
1963 $self->{gauge}->set_max ($max);
1964 $self->{max}->set_text ($max);
1965}
1966
1864sub set_value { 1967sub set_value {
1865 my ($self, $val, $max) = @_; 1968 my ($self, $val, $max) = @_;
1866 1969
1867 $self->set_max ($max) 1970 $self->set_max ($max)
1868 if defined $max; 1971 if defined $max;
1869 1972
1870 $self->{gauge}->set_value ($val, $max); 1973 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 1974 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 1975}
1880 1976
1881############################################################################# 1977#############################################################################
1882 1978
1883package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
… …
1902 # TODO: calculations are off 1998 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1905 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1906 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1907 req_w => 20, 2003 req_w => $::WIDTH / 80,
1908 req_h => 20, 2004 req_h => $::WIDTH / 80,
1909 vertical => 0, 2005 vertical => 0,
1910 can_hover => 1, 2006 can_hover => 1,
1911 inner_pad => 5, 2007 inner_pad => 5,
1912 @_ 2008 @_
1913 ); 2009 );
… …
1996 $page ||= 2; 2092 $page ||= 2;
1997 2093
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000 2096
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2099
2006 # draw background 2100 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2008 2102
2009 # draw handle 2103 # draw handle
2010 $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);
2011 2105
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
2014} 2107}
2015 2108
2016############################################################################# 2109#############################################################################
2017 2110
… …
2028 fontsize => 1, 2121 fontsize => 1,
2029 can_events => 0, 2122 can_events => 0,
2030 #font => default_font 2123 #font => default_font
2031 @_, 2124 @_,
2032 2125
2033 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
2034 par => [], 2127 par => [],
2035 height => 0, 2128 height => 0,
2036 children => [ 2129 children => [
2037 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
2039 ], 2132 ],
2040 ); 2133 );
2041 2134
2042 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2136
2046 $self 2137 $self
2047} 2138}
2048 2139
2049sub set_fontsize { 2140sub set_fontsize {
… …
2057 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
2058 2149
2059 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
2060 2151
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
2063 $layout->set_text ($text); 2154 $layout->set_markup ($text);
2064 2155
2065 ($layout->size)[1] 2156 ($layout->size)[1]
2066} 2157}
2067 2158
2068sub reflow { 2159sub reflow {
… …
2106 2197
2107 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2108 2199
2109 delete $self->{texture}; 2200 delete $self->{texture};
2110 2201
2111 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2112 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2204 my $height = 0;
2114 2205
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2116 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2121 2212
2122 delete $self->{texture}; 2213 delete $self->{texture};
2123 } 2214 }
2124 2215
2125 $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 {
2126 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2128 2219
2129 glEnable GL_BLEND;
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133 2222
2134 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2135 2224
… …
2144 2233
2145 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2235 my $h = $par->[0];
2147 2236
2148 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2149 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2150 2240
2151 glColor @{ $par->[1] };
2152 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2153 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);
2154 } 2243 }
2155 2244
2156 $y += $h; 2245 $y += $h;
2157 } 2246 }
2158 2247
2159 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND;
2161 }; 2249 };
2162 }); 2250 });
2163} 2251}
2164 2252
2165sub _draw { 2253sub _draw {
2166 my ($self) = @_; 2254 my ($self) = @_;
2167 2255
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2258 glColor 1, 1, 1, 1;
2172 $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});
2173 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2174 }
2175 2261
2176 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2177 2263
2178} 2264}
2179 2265
… …
2273 @_, 2359 @_,
2274 can_events => 0, 2360 can_events => 0,
2275 ) 2361 )
2276} 2362}
2277 2363
2278sub set_markup { 2364sub set_tooltip_from {
2279 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2280 2366
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2282 $self->{label}->set_markup ($text); 2368 markup => $widget->{tooltip},
2283 $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 );
2284} 2374}
2285 2375
2286sub size_request { 2376sub size_request {
2287 my ($self) = @_; 2377 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2378
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2380
2293 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2294} 2382}
… …
2300} 2388}
2301 2389
2302sub _draw { 2390sub _draw {
2303 my ($self) = @_; 2391 my ($self) = @_;
2304 2392
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2307 2394
2308 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2309 2396
2310 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2408 glVertex 0 , $h;
2322 glVertex $w, $h; 2409 glVertex $w, $h;
2323 glVertex $w, 0; 2410 glVertex $w, 0;
2324 glEnd; 2411 glEnd;
2325 2412
2326 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2330} 2415}
2331 2416
2332############################################################################# 2417#############################################################################
2333 2418
… …
2348 2433
2349sub size_request { 2434sub size_request {
2350 (32, 8) 2435 (32, 8)
2351} 2436}
2352 2437
2353sub draw { 2438sub _draw {
2354 my ($self) = @_; 2439 my ($self) = @_;
2355 2440
2441 return unless $::CONN;#d# manage and cache textures differently
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357 2443
2444 # TODO animation
2358 if ($tex) { 2445 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2446 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2448 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 } 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;
2368} 2729}
2369 2730
2370############################################################################# 2731#############################################################################
2371 2732
2372package CFClient::UI::Root; 2733package CFClient::UI::Root;
2373 2734
2374our @ISA = CFClient::UI::Container::; 2735our @ISA = CFClient::UI::Container::;
2375 2736
2376use CFClient::OpenGL; 2737use CFClient::OpenGL;
2377 2738
2378sub check_size { 2739sub new {
2379 my ($self) = @_; 2740 my $class = shift;
2380 2741
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2742 $class->SUPER::new (
2382} 2743 @_,
2383 2744 )
2384sub size_request {
2385 ($::WIDTH, $::HEIGHT)
2386} 2745}
2387 2746
2388sub configure { 2747sub configure {
2389 my ($self, $x, $y, $w, $h) = @_; 2748 my ($self, $x, $y, $w, $h) = @_;
2390 2749
2391 $self->SUPER::configure ($x, $y, $w, $h); 2750 $self->{w} = $w;
2751 $self->{h} = $h;
2752}
2392 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
2393 for my $child (@{$self->{children}}) { 2786 for my $child ($self->children) {
2394 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)};
2395 2788
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2789 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2398 $child->configure ($X, $Y, $W,$H); 2791 $child->configure ($X, $Y, $W, $H);
2399 } 2792 }
2400}
2401 2793
2402sub _topleft { 2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796}
2797
2798sub coord2local {
2403 my ($self, $x, $y) = @_; 2799 my ($self, $x, $y) = @_;
2404 2800
2405 ($x, $y) 2801 ($x, $y)
2406} 2802}
2407 2803
2804sub coord2global {
2805 my ($self, $x, $y) = @_;
2806
2807 ($x, $y)
2808}
2809
2408sub update { 2810sub update {
2409 my ($self) = @_; 2811 my ($self) = @_;
2410 2812
2411 $self->check_size; 2813 $self->check_size;
2412 ::refresh (); 2814 $::WANT_REFRESH++;
2413} 2815}
2414 2816
2415sub add { 2817sub add {
2416 my ($self, $child) = @_; 2818 my ($self, $child) = @_;
2417 2819
2418 # integerize window positions 2820 # integerise window positions
2419 $child->{x} = int $child->{x}; 2821 $child->{x} = int $child->{x};
2420 $child->{y} = int $child->{y}; 2822 $child->{y} = int $child->{y};
2421 2823
2422 $self->SUPER::add ($child); 2824 $self->SUPER::add ($child);
2423} 2825}
… …
2426 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2427 2829
2428 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2429} 2831}
2430 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2431sub draw { 2839sub draw {
2432 my ($self) = @_; 2840 my ($self) = @_;
2433 2841
2434 while (my $rcb = delete $self->{refresh_hook}) { 2842 while ($self->{refresh_hook}) {
2435 $_->() 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}};
2436 } 2895 }
2437 2896
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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