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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 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;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260}
261
241sub set_max_size { 262sub set_max_size {
242 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
243 264
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 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}->_topleft ($x + $self->{x}, $y + $self->{y});
253} 267}
254 268
255# translate global coordinates to local coordinate system 269# translate global coordinates to local coordinate system
256sub coord2local { 270sub coord2local {
257 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
258 272
259 my ($X, $Y) = $self->_topleft; 273 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 274}
262 275
263# translate local coordinates to global coordinate system 276# translate local coordinates to global coordinate system
264sub coord2global { 277sub coord2global {
265 my ($self, $x, $y) = @_; 278 my ($self, $x, $y) = @_;
266 279
267 my ($X, $Y) = $self->_topleft; 280 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 281}
270 282
271sub focus_in { 283sub focus_in {
272 my ($self) = @_; 284 my ($self) = @_;
273 285
… …
371 383
372sub set_parent { 384sub set_parent {
373 my ($self, $parent) = @_; 385 my ($self, $parent) = @_;
374 386
375 Scalar::Util::weaken ($self->{parent} = $parent); 387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
376} 391}
377 392
378sub check_size { 393sub check_size {
379 my ($self) = @_; 394 my ($self, $forced) = @_;
380 395
381 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
382 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 398}
403 399
404sub update { 400sub update {
405 my ($self) = @_; 401 my ($self) = @_;
406 402
… …
503 499
504 $self 500 $self
505} 501}
506 502
507sub add { 503sub add {
508 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
509 505
510 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
511 508
512 use sort 'stable'; 509 use sort 'stable';
513 510
514 $self->{children} = [ 511 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
517 ]; 514 ];
518 515
519 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
520} 522}
521 523
522sub remove { 524sub remove {
523 my ($self, $child) = @_; 525 my ($self, $child) = @_;
524 526
… …
539 541
540 for (@$children) { 542 for (@$children) {
541 delete $_->{parent}; 543 delete $_->{parent};
542 $_->hide; 544 $_->hide;
543 } 545 }
546
547 $self->check_size;
548 $self->update;
544} 549}
545 550
546sub find_widget { 551sub find_widget {
547 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
548 553
… …
623} 628}
624 629
625sub update { 630sub update {
626 my ($self) = @_; 631 my ($self) = @_;
627 632
628 # we want to do this delayed... 633 $ROOT->on_refresh ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 634 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 635}
642 636
643sub size_allocate { 637sub size_allocate {
644 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
645 639
646 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
647 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
648 $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 };
649} 664}
650 665
651sub _draw { 666sub _draw {
652 my ($self) = @_; 667 my ($self) = @_;
653 668
654 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
655 670
656 my $tex = $self->{texture} 671 my $tex = $self->{texture}
657 or return; 672 or return;
658 673
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
662 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;
663 677
664 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 679
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
668} 681}
669 682
670############################################################################# 683#############################################################################
671 684
672package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
673 686
674our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
675 688
676sub new { die }
677
678sub size_request { 689sub size_request {
679 my ($self) = @_; 690 my ($self) = @_;
680 691
681 @$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)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
683 694
684 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
685} 696}
686 697
687sub _draw { 698sub size_allocate {
688 my ($self) = @_; 699 my ($self, $w, $h) = @_;
689 700
690 $self->{children}[1]->draw; 701 $self->update;
691} 702}
692 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
693 706
694############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
695 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
696package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
697 752
698our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
699
700use CFClient::OpenGL;
701 754
702sub new { 755sub new {
703 my $class = shift; 756 my $class = shift;
704 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
705 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
707 border_bg => [1, 1, 1, 1], 770 slider => $slider,
708 border => 0.8,
709 @_ 771 @_,
710 ); 772 );
711 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
712 $self 778 $self
713} 779}
714 780
715sub _draw { 781#TODO# update range on size_allocate depeneing on child
716 my ($self) = @_; 782# update viewport offset on scroll
717 783
718 my ($w, $h) = ($self->{w}, $self->{h}); 784#############################################################################
719 785
720 glEnable GL_BLEND; 786package CFClient::UI::Frame;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724 787
725# glBegin GL_QUADS; 788our @ISA = CFClient::UI::Bin::;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0;
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732 789
733 790use CFClient::OpenGL;
734 $self->child->draw;
735 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D;
737}
738 791
739############################################################################# 792#############################################################################
740 793
741package CFClient::UI::FancyFrame; 794package CFClient::UI::FancyFrame;
742 795
… …
754 # TODO: user_x, user_y, overwrite moveto? 807 # TODO: user_x, user_y, overwrite moveto?
755 808
756 my $self = $class->SUPER::new ( 809 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 810 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 811 border_bg => [1, 1, 1, 1],
759 border => 0.8, 812 border => 0.6,
760 can_events => 1, 813 can_events => 1,
761 @_ 814 @_
762 ); 815 );
763 816
764 $self->{title} &&= new CFClient::UI::Label 817 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 818 align => 0,
766 valign => 1, 819 valign => 1,
767 text => $self->{title}, 820 text => $self->{title},
768 fontsize => 1; 821 fontsize => $self->{border};
769 822
770 $self 823 $self
771} 824}
772 825
773sub border { 826sub border {
… …
798} 851}
799 852
800sub button_down { 853sub button_down {
801 my ($self, $ev, $x, $y) = @_; 854 my ($self, $ev, $x, $y) = @_;
802 855
856 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 857 my $border = $self->border;
804 858
805 if ($x < $self->{w} && $x >= $self->{w} - $border 859 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 860 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 861
862 if ($lr & $td) {
863 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 865 my ($bw, $bh) = ($self->{w}, $self->{h});
810 866
867 my $mx = $x < $border;
868 my $my = $y < $border;
869
811 $self->{motion} = sub { 870 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 871 my ($ev, $x, $y) = @_;
813 872
814 ($x, $y) = ($ev->{x}, $ev->{y}); 873 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy;
815 875
816 $self->{user_w} = $bw + $x - $ox; 876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 879 $self->check_size;
819 }; 880 };
820 881
821 } elsif ($x >= 0 && $x < $self->{w} 882 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 883 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 884 my ($bx, $by) = ($self->{x}, $self->{y});
826 885
827 $self->{motion} = sub { 886 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 887 my ($ev, $x, $y) = @_;
… …
851 my ($self) = @_; 910 my ($self) = @_;
852 911
853 my ($w, $h ) = ($self->{w}, $self->{h}); 912 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855 914
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 917
861 my $border = $self->border; 918 my $border = $self->border;
862 919
863 glColor @{ $self->{border_bg} }; 920 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 921 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868 925
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 927 my $bg = $tex[0];
870 928
871 # TODO: repeat texture not scale 929 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 930 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 931 my $rep_y = $ch / $bg->{h};
874 932
875 glColor @{ $self->{bg} }; 933 glColor @{ $self->{bg} };
876 934
877 $bg->{s} = $rep_x; 935 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 936 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 937 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 938 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 }
881 940
882 glDisable GL_TEXTURE_2D; 941 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 942
885 $self->{title}->draw if $self->{title}; 943 $self->{title}->draw if $self->{title};
944
886 $self->child->draw; 945 $self->child->draw;
887} 946}
888 947
889############################################################################# 948#############################################################################
890 949
… …
912 $self->{children}[$y][$x] = $child; 971 $self->{children}[$y][$x] = $child;
913 972
914 $child->check_size; 973 $child->check_size;
915} 974}
916 975
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
917# TODO: move to container class maybe? send childs a signal on removal? 980# TODO: move to container class maybe? send childs a signal on removal?
918sub clear { 981sub clear {
919 my ($self) = @_; 982 my ($self) = @_;
920 983
921 my $children = delete $self->{children}; 984 my @children = $self->children;
985 delete $self->{children};
922 986
923 for (grep $_, map @$_, grep $_, @$children) { 987 for (@children) {
924 delete $_->{parent}; 988 delete $_->{parent};
925 $_->hide; 989 $_->hide;
926 } 990 }
927 991
928 $self->update; 992 $self->update;
… …
1109} 1173}
1110 1174
1111sub size_allocate { 1175sub size_allocate {
1112 my ($self, $w, $h) = @_; 1176 my ($self, $w, $h) = @_;
1113 1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1114 my $children = $self->{children}; 1180 my $children = $self->{children};
1115 1181
1116 my @h = map $_->{req_h}, @$children; 1182 my @h = map $_->{req_h}, @$children;
1117 1183
1118 my $req_h = List::Util::sum @h; 1184 my $req_h = List::Util::sum @h;
… …
1157 my ($class, %arg) = @_; 1223 my ($class, %arg) = @_;
1158 1224
1159 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1226 fg => [1, 1, 1],
1161 #font => default_font 1227 #font => default_font
1228 #text => initial text
1229 #markup => initial narkup
1230 layout => (new CFClient::Layout),
1162 fontsize => 1, 1231 fontsize => 1,
1163 text => "",
1164 align => -1, 1232 align => -1,
1165 valign => -1, 1233 valign => -1,
1166 padding => 2, 1234 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1235 can_events => 0,
1169 %arg 1236 %arg
1170 ); 1237 );
1171 1238
1172 if (exists $self->{template}) { 1239 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1240 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1241 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1242 $self->{template} = $layout;
1176 } 1243 }
1177 1244
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1245 if (exists $self->{markup}) {
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1246 $self->set_markup (delete $self->{markup});
1247 } else {
1248 $self->set_text (delete $self->{text});
1249 }
1180 1250
1181 $self 1251 $self
1182} 1252}
1183 1253
1184sub escape { 1254sub escape {
… …
1189 s/</&lt;/g; 1259 s/</&lt;/g;
1190 1260
1191 $_[1] 1261 $_[1]
1192} 1262}
1193 1263
1264sub update {
1265 my ($self) = @_;
1266
1267 delete $self->{texture};
1268 $self->SUPER::update;
1269}
1270
1194sub set_text { 1271sub set_text {
1195 my ($self, $text) = @_; 1272 my ($self, $text) = @_;
1196 1273
1274 return if $self->{text} eq "T$text";
1275 $self->{text} = "T$text";
1276
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197 $self->{layout}->set_text ($text); 1278 $self->{layout}->set_text ($text);
1198 1279
1199 delete $self->{texture}; 1280 $self->update;
1200 $self->check_size; 1281 $self->check_size;
1201 $self->update;
1202} 1282}
1203 1283
1204sub set_markup { 1284sub set_markup {
1205 my ($self, $markup) = @_; 1285 my ($self, $markup) = @_;
1206 1286
1287 return if $self->{text} eq "M$markup";
1288 $self->{text} = "M$markup";
1289
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207 $self->{layout}->set_markup ($markup); 1293 $self->{layout}->set_markup ($markup);
1208 1294
1209 delete $self->{texture}; 1295 $self->update;
1210 $self->check_size; 1296 $self->check_size;
1211 $self->update;
1212} 1297}
1213 1298
1214sub size_request { 1299sub size_request {
1215 my ($self) = @_; 1300 my ($self) = @_;
1216 1301
… …
1245sub set_fontsize { 1330sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1331 my ($self, $fontsize) = @_;
1247 1332
1248 $self->{fontsize} = $fontsize; 1333 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1334 delete $self->{texture};
1335
1336 $self->update;
1250 $self->check_size; 1337 $self->check_size;
1251 $self->update;
1252} 1338}
1253 1339
1254sub _draw { 1340sub _draw {
1255 my ($self) = @_; 1341 my ($self) = @_;
1256 1342
1257 my $tex = $self->{texture} ||= do { 1343 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1345 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1346 $self->{layout}->set_width ($self->{w});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1348
1261 new_from_layout CFClient::Texture $self->{layout} 1349 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5;
1354
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5;
1358
1359 $tex
1262 }; 1360 };
1263 1361
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1362 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1364
1365 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1366 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy}); 1367 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1368 } else {
1369 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1370 }
1284 1371
1285 glDisable GL_TEXTURE_2D; 1372 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1373}
1288 1374
1289############################################################################# 1375#############################################################################
1290 1376
1291package CFClient::UI::EntryBase; 1377package CFClient::UI::EntryBase;
… …
1326 $self->{layout}->set_text ("$text "); 1412 $self->{layout}->set_text ("$text ");
1327 1413
1328 $self->emit (changed => $self->{text}); 1414 $self->emit (changed => $self->{text});
1329} 1415}
1330 1416
1417sub set_text {
1418 my ($self, $text) = @_;
1419
1420 $self->{cursor} = length $text;
1421 $self->_set_text ($text);
1422 $self->check_size;
1423 $self->update;
1424}
1425
1331sub get_text { 1426sub get_text {
1332 $_[0]{text} 1427 $_[0]{text}
1333} 1428}
1334 1429
1335sub size_request { 1430sub size_request {
… …
1342 1437
1343sub size_allocate { 1438sub size_allocate {
1344 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1345 1440
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355} 1442}
1356 1443
1357sub key_down { 1444sub key_down {
1358 my ($self, $ev) = @_; 1445 my ($self, $ev) = @_;
1359 1446
… …
1469 1556
1470 if ($sym == 13) { 1557 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1558 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1559 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1560 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1562 $self->emit (activate => $txt);
1475 $self->update; 1563 $self->update;
1476 1564
1477 } elsif ($sym == CFClient::SDLK_UP) { 1565 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1566 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1567 $self->{history_saveback} = $self->get_text;
1480 } 1568 }
1569 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1570 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1571 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1572 $self->{history_pointer} = @{$self->{history} || []} - 1;
1573 }
1574 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1575 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1576
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1577 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1578 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1579 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1580
… …
1544 1634
1545 if ($GRAB == $self) { 1635 if ($GRAB == $self) {
1546 $self->{fg} = $self->{active_fg}; 1636 $self->{fg} = $self->{active_fg};
1547 } 1637 }
1548 1638
1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1; 1641 glColor 0, 0, 0, 1;
1554 1642
1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1643 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556 1644
1557 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1558 glDisable GL_BLEND;
1559 1646
1560 $self->SUPER::_draw; 1647 $self->SUPER::_draw;
1561} 1648}
1562 1649
1563############################################################################# 1650#############################################################################
… …
1610 1697
1611 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1612 1699
1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614 1701
1615 glEnable GL_BLEND; 1702 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703
1616 glEnable GL_TEXTURE_2D; 1704 glEnable GL_TEXTURE_2D;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619 my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621 $tex->draw_quad (0, 0, $s, $s); 1705 $tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623 glDisable GL_TEXTURE_2D; 1706 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625} 1707}
1626 1708
1627############################################################################# 1709#############################################################################
1628 1710
1629package CFClient::UI::Image; 1711package CFClient::UI::Image;
… …
1672 glTranslate 0, -$self->{w}, 0; 1754 glTranslate 0, -$self->{w}, 0;
1673 1755
1674 ($w, $h) = ($h, $w); 1756 ($w, $h) = ($h, $w);
1675 } 1757 }
1676 1758
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 1761
1682 $tex->draw_quad (0, 0, $w, $h); 1762 $tex->draw_quad_alpha (0, 0, $w, $h);
1683 1763
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D; 1764 glDisable GL_TEXTURE_2D;
1686} 1765}
1687 1766
1688############################################################################# 1767#############################################################################
1689 1768
… …
1737} 1816}
1738 1817
1739sub set_max { 1818sub set_max {
1740 my ($self, $max) = @_; 1819 my ($self, $max) = @_;
1741 1820
1821 return if $self->{max_val} == $max;
1822
1742 $self->{max_val} = $max; 1823 $self->{max_val} = $max;
1824 $self->update;
1743} 1825}
1744 1826
1745sub set_value { 1827sub set_value {
1746 my ($self, $val, $max) = @_; 1828 my ($self, $val, $max) = @_;
1747 1829
1748 $self->set_max ($max) 1830 $self->set_max ($max)
1749 if defined $max; 1831 if defined $max;
1750 1832
1751 $max = $self->{max_val}; 1833 return if $self->{val} == $val;
1834
1752 $self->{val} = $val; 1835 $self->{val} = $val;
1753
1754 $self->update; 1836 $self->update;
1755} 1837}
1756 1838
1757sub _draw { 1839sub _draw {
1758 my ($self) = @_; 1840 my ($self) = @_;
… …
1821 1903
1822sub new { 1904sub new {
1823 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1824 1906
1825 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 1908 tooltip => $arg{type},
1827 can_hover => 1, 1909 can_hover => 1,
1910 can_events => 1,
1828 %arg, 1911 %arg,
1829 ); 1912 );
1830 1913
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1914 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1915 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1840 1923
1841 $self->{value}->set_fontsize ($fsize); 1924 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 1925 $self->{max} ->set_fontsize ($fsize);
1843} 1926}
1844 1927
1928sub set_max {
1929 my ($self, $max) = @_;
1930
1931 $self->{gauge}->set_max ($max);
1932 $self->{max}->set_text ($max);
1933}
1934
1845sub set_value { 1935sub set_value {
1846 my ($self, $val, $max) = @_; 1936 my ($self, $val, $max) = @_;
1847 1937
1848 $self->set_max ($max) 1938 $self->set_max ($max)
1849 if defined $max; 1939 if defined $max;
1850 1940
1851 $self->{gauge}->set_value ($val, $max); 1941 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 1942 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 1943}
1861 1944
1862############################################################################# 1945#############################################################################
1863 1946
1864package CFClient::UI::Slider; 1947package CFClient::UI::Slider;
… …
1883 # TODO: calculations are off 1966 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 1967 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1886 active_fg => [0, 0, 0], 1969 active_fg => [0, 0, 0],
1887 range => [0, 0, 100, 10], 1970 range => [0, 0, 100, 10],
1888 req_w => 20, 1971 req_w => $::WIDTH / 80,
1889 req_h => 20, 1972 req_h => $::WIDTH / 80,
1890 vertical => 0, 1973 vertical => 0,
1891 can_hover => 1, 1974 can_hover => 1,
1892 inner_pad => 5, 1975 inner_pad => 5,
1893 @_ 1976 @_
1894 ); 1977 );
… …
1977 $page ||= 2; 2060 $page ||= 2;
1978 2061
1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981 2064
1982 glEnable GL_BLEND;
1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984 glEnable GL_TEXTURE_2D; 2065 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2067
1987 # draw background 2068 # draw background
1988 $tex[1]->draw_quad (0, 0, $w, $h); 2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1989 2070
1990 # draw handle 2071 # draw handle
1991 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1992 2073
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D; 2074 glDisable GL_TEXTURE_2D;
1995} 2075}
1996 2076
1997############################################################################# 2077#############################################################################
1998 2078
… …
2009 fontsize => 1, 2089 fontsize => 1,
2010 can_events => 0, 2090 can_events => 0,
2011 #font => default_font 2091 #font => default_font
2012 @_, 2092 @_,
2013 2093
2014 layout => (new CFClient::Layout), 2094 layout => (new CFClient::Layout 1),
2015 par => [], 2095 par => [],
2016 height => 0, 2096 height => 0,
2017 children => [ 2097 children => [
2018 (new CFClient::UI::Empty expand => 1), 2098 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2099 (new CFClient::UI::Slider vertical => 1),
2020 ], 2100 ],
2021 ); 2101 );
2022 2102
2023 $self->{children}[1]->connect (changed => sub { 2103 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2104
2027 $self 2105 $self
2028} 2106}
2029 2107
2030sub set_fontsize { 2108sub set_fontsize {
… …
2038 my ($self, $text) = @_; 2116 my ($self, $text) = @_;
2039 2117
2040 my $layout = $self->{layout}; 2118 my $layout = $self->{layout};
2041 2119
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w}); 2121 $layout->set_width ($self->{children}[0]{w});
2044 $layout->set_text ($text); 2122 $layout->set_markup ($text);
2045 2123
2046 ($layout->size)[1] 2124 ($layout->size)[1]
2047} 2125}
2048 2126
2049sub reflow { 2127sub reflow {
… …
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2102 2180
2103 delete $self->{texture}; 2181 delete $self->{texture};
2104 } 2182 }
2105 2183
2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2107 glClearColor 0, 0, 0, 1; 2185 glClearColor 0, 0, 0, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2186 glClear GL_COLOR_BUFFER_BIT;
2109 2187
2110 glEnable GL_BLEND;
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D; 2188 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114 2190
2115 my $top = int $self->{children}[1]{range}[0]; 2191 my $top = int $self->{children}[1]{range}[0];
2116 2192
… …
2125 2201
2126 for my $par (@{$self->{par}}) { 2202 for my $par (@{$self->{par}}) {
2127 my $h = $par->[0]; 2203 my $h = $par->[0];
2128 2204
2129 if ($y0 < $y + $h && $y < $y1) { 2205 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] });
2130 $layout->set_text ($par->[2]); 2207 $layout->set_markup ($par->[2]);
2131 2208
2132 glColor @{ $par->[1] };
2133 my ($W, $H) = $layout->size; 2209 my ($W, $H) = $layout->size;
2134 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2135 } 2211 }
2136 2212
2137 $y += $h; 2213 $y += $h;
2138 } 2214 }
2139 2215
2140 glDisable GL_TEXTURE_2D; 2216 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND;
2142 }; 2217 };
2143 }); 2218 });
2144} 2219}
2145 2220
2146sub _draw { 2221sub _draw {
2147 my ($self) = @_; 2222 my ($self) = @_;
2148 2223
2149 if ($self->{texture}) {
2150 glEnable GL_TEXTURE_2D; 2224 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2226 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2153 glDisable GL_TEXTURE_2D; 2228 glDisable GL_TEXTURE_2D;
2154 }
2155 2229
2156 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2157 2231
2158} 2232}
2159 2233
… …
2253 @_, 2327 @_,
2254 can_events => 0, 2328 can_events => 0,
2255 ) 2329 )
2256} 2330}
2257 2331
2258sub set_markup { 2332sub set_tooltip_from {
2259 my ($self, $text) = @_; 2333 my ($self, $widget) = @_;
2260 2334
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2335 $self->add (new CFClient::UI::Label
2262 $self->{label}->set_markup ($text); 2336 markup => $widget->{tooltip},
2263 $self->add ($self->{label}); 2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8,
2339 fg => [0, 0, 0, 1],
2340 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 );
2264} 2342}
2265 2343
2266sub size_request { 2344sub size_request {
2267 my ($self) = @_; 2345 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270 2346
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272 2348
2273 ($w + 4, $h + 4) 2349 ($w + 4, $h + 4)
2274} 2350}
… …
2280} 2356}
2281 2357
2282sub _draw { 2358sub _draw {
2283 my ($self) = @_; 2359 my ($self) = @_;
2284 2360
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375; 2361 glTranslate 0.375, 0.375;
2287 2362
2288 my ($w, $h) = @$self{qw(w h)}; 2363 my ($w, $h) = @$self{qw(w h)};
2289 2364
2290 glColor 1, 0.8, 0.4; 2365 glColor 1, 0.8, 0.4;
… …
2301 glVertex 0 , $h; 2376 glVertex 0 , $h;
2302 glVertex $w, $h; 2377 glVertex $w, $h;
2303 glVertex $w, 0; 2378 glVertex $w, 0;
2304 glEnd; 2379 glEnd;
2305 2380
2306 glPopMatrix; 2381 glTranslate 2 - 0.375, 2 - 0.375;
2307
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw; 2382 $self->SUPER::_draw;
2310} 2383}
2311 2384
2312############################################################################# 2385#############################################################################
2313 2386
… …
2328 2401
2329sub size_request { 2402sub size_request {
2330 (32, 8) 2403 (32, 8)
2331} 2404}
2332 2405
2333sub draw { 2406sub _draw {
2334 my ($self) = @_; 2407 my ($self) = @_;
2335 2408
2409 return unless $::CONN;#d# manage and cache textures differently
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337 2411
2412 # TODO animation
2338 if ($tex) { 2413 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D; 2414 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1; 2416 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D; 2418 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 } 2419 }
2420}
2421
2422#############################################################################
2423
2424package CFClient::UI::InventoryItem;
2425
2426our @ISA = CFClient::UI::HBox::;
2427
2428sub new {
2429 my $class = shift;
2430
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new (
2441 can_hover => 1,
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487
2488#############################################################################
2489
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_,
2500 );
2501
2502 $self
2503}
2504
2505sub set_items {
2506 my ($self, $items) = @_;
2507
2508 $self->{scrolled}->clear;
2509 return unless $items;
2510
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2512
2513 $self->{real_items} = \@items;
2514
2515 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2521 }
2522
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524}
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Menu;
2534
2535our @ISA = CFClient::UI::FancyFrame::;
2536
2537use CFClient::OpenGL;
2538
2539sub new {
2540 my $class = shift;
2541
2542 my $self = $class->SUPER::new (
2543 items => [],
2544 z => 100,
2545 @_,
2546 );
2547
2548 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2549
2550 for my $item (@{ $self->{items} }) {
2551 my ($widget, $cb) = @$item;
2552
2553 # handle various types of items, only text for now
2554 if (!ref $widget) {
2555 $widget = new CFClient::UI::Label
2556 can_hover => 1,
2557 can_events => 1,
2558 text => $widget;
2559 }
2560
2561 $self->{item}{$widget} = $item;
2562
2563 $self->{vbox}->add ($widget);
2564 }
2565
2566 $self
2567}
2568
2569# popup given the event (must be a mouse button down event currently)
2570sub popup {
2571 my ($self, $ev) = @_;
2572
2573 $self->emit ("popdown");
2574
2575 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self;
2577 $self->{button} = $ev->{button};
2578
2579 $self->show;
2580 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2581}
2582
2583sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_;
2585
2586 # TODO: should use vbox->find_widget or so
2587 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2588 $self->{hover} = $self->{item}{$HOVER};
2589}
2590
2591sub button_up {
2592 my ($self, $ev, $x, $y) = @_;
2593
2594 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB;
2596 $self->hide;
2597
2598 $self->emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover};
2600 }
2601}
2602
2603#############################################################################
2604
2605package CFClient::UI::Statusbox;
2606
2607our @ISA = CFClient::UI::VBox::;
2608
2609sub reorder {
2610 my ($self) = @_;
2611 my $NOW = time;
2612
2613 while (my ($k, $v) = each %{ $self->{item} }) {
2614 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2615 }
2616
2617 my @widgets;
2618
2619 my @items = sort {
2620 $a->{pri} <=> $b->{pri}
2621 or $b->{id} <=> $a->{id}
2622 } values %{ $self->{item} };
2623
2624 my $count = 10 + 1;
2625 for my $item (@items) {
2626 last unless --$count;
2627
2628 push @widgets, $item->{label} ||= do {
2629 # TODO: doesn't handle markup well (read as: at all)
2630 my $short = $item->{count} > 1
2631 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text};
2633
2634 for ($short) {
2635 s/^\s+//;
2636 s/\012.*/…/s;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 }
2640
2641 new CFClient::UI::Label
2642 markup => $short,
2643 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize},
2647 color => $item->{color},
2648 can_events => 1,
2649 can_hover => 1
2650 };
2651 }
2652
2653 $self->clear;
2654 $self->SUPER::add (reverse @widgets);
2655}
2656
2657sub add {
2658 my ($self, $text, %arg) = @_;
2659
2660 my $timeout = time + ((delete $arg{timeout}) || 60);
2661
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663
2664 if (my $item = $self->{item}{$group}) {
2665 if ($item->{text} eq $text) {
2666 $item->{count}++;
2667 } else {
2668 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text;
2670 }
2671 $item->{timeout} = $timeout;
2672 delete $item->{label};
2673 } else {
2674 $self->{item}{$group} = {
2675 id => ++$self->{id},
2676 text => $text,
2677 timeout => $timeout,
2678 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0,
2682 count => 1,
2683 %arg,
2684 };
2685 }
2686
2687 $self->reorder;
2348} 2688}
2349 2689
2350############################################################################# 2690#############################################################################
2351 2691
2352package CFClient::UI::Root; 2692package CFClient::UI::Root;
2353 2693
2354our @ISA = CFClient::UI::Container::; 2694our @ISA = CFClient::UI::Container::;
2355 2695
2356use CFClient::OpenGL; 2696use CFClient::OpenGL;
2357 2697
2358sub check_size { 2698sub new {
2359 my ($self) = @_; 2699 my $class = shift;
2360 2700
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2701 $class->SUPER::new (
2362} 2702 @_,
2363 2703 )
2364sub size_request {
2365 ($::WIDTH, $::HEIGHT)
2366} 2704}
2367 2705
2368sub configure { 2706sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 2707 my ($self, $x, $y, $w, $h) = @_;
2370 2708
2371 $self->SUPER::configure ($x, $y, $w, $h); 2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2372 2712
2713sub check_size {
2714 my ($self) = @_;
2715
2716 $self->size_allocate ($self->{w}, $self->{h})
2717 if $self->{w};
2718}
2719
2720sub size_request {
2721 my ($self) = @_;
2722
2723 ($self->{w}, $self->{h})
2724}
2725
2726sub size_allocate {
2727 my ($self, $w, $h) = @_;
2728
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744
2373 for my $child (@{$self->{children}}) { 2745 for my $child ($self->children) {
2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375 2747
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2748 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H); 2750 $child->configure ($X, $Y, $W, $H);
2379 } 2751 }
2380}
2381 2752
2382sub _topleft { 2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755}
2756
2757sub coord2local {
2383 my ($self, $x, $y) = @_; 2758 my ($self, $x, $y) = @_;
2384 2759
2385 ($x, $y) 2760 ($x, $y)
2386} 2761}
2387 2762
2763sub coord2global {
2764 my ($self, $x, $y) = @_;
2765
2766 ($x, $y)
2767}
2768
2388sub update { 2769sub update {
2389 my ($self) = @_; 2770 my ($self) = @_;
2390 2771
2391 $self->check_size; 2772 $self->check_size;
2392 ::refresh (); 2773 $::WANT_REFRESH++;
2393} 2774}
2394 2775
2395sub add { 2776sub add {
2396 my ($self, $child) = @_; 2777 my ($self, $child) = @_;
2397 2778
2398 # integerize window positions 2779 # integerise window positions
2399 $child->{x} = int $child->{x}; 2780 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y}; 2781 $child->{y} = int $child->{y};
2401 2782
2402 $self->SUPER::add ($child); 2783 $self->SUPER::add ($child);
2403} 2784}
… …
2406 my ($self, $id, $cb) = @_; 2787 my ($self, $id, $cb) = @_;
2407 2788
2408 $self->{refresh_hook}{$id} = $cb; 2789 $self->{refresh_hook}{$id} = $cb;
2409} 2790}
2410 2791
2411sub draw { 2792sub draw {
2412 my ($self) = @_; 2793 my ($self) = @_;
2413 2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839
2414 while (my $rcb = delete $self->{refresh_hook}) { 2840 while ($self->{refresh_hook}) {
2415 $_->() for values %$rcb; 2841 $_->()
2842 for values %{delete $self->{refresh_hook}};
2416 } 2843 }
2417 2844
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2845 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 2847 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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