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.175 by root, Tue Apr 25 11:48:31 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
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31 31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) { 34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 } 36 }
37 37
38 $TOOLTIP->move ($x, $y); 38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
39 } 41 }
40 42
41 return; 43 return;
42 } 44 }
43 } 45 }
… …
232 $self->{y} = $y; 234 $self->{y} = $y;
233 $self->update; 235 $self->update;
234 } 236 }
235 237
236 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 240 }
243} 241}
244 242
245sub size_allocate { 243sub size_allocate {
246 # nothing to be done 244 # nothing to be done
247} 245}
248 246
249sub children { 247sub children {
250} 248}
251 249
252# call when resoltuion changes etc. 250# call when resolution changes etc.
253sub reconfigure { 251sub reconfigure {
254 my ($self) = @_; 252 my ($self) = @_;
255 253
256 $_->reconfigure 254 $_->reconfigure
257 for $self->children; 255 for $self->children;
258 256
259 $_->check_size; 257 $self->check_size (1);
258 $self->update;
260} 259}
261 260
262sub set_max_size { 261sub set_max_size {
263 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
264 263
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277} 266}
278 267
279# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
280sub coord2local { 269sub coord2local {
281 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
282 271
283 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 273}
286 274
287# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
288sub coord2global { 276sub coord2global {
289 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
290 278
291 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 280}
294 281
295sub focus_in { 282sub focus_in {
296 my ($self) = @_; 283 my ($self) = @_;
297 284
… …
395 382
396sub set_parent { 383sub set_parent {
397 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
398 385
399 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};
400} 391}
401 392
402sub check_size { 393sub check_size {
403 my ($self) = @_; 394 my ($self, $forced) = @_;
404 395
405 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
406 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 398}
427 399
428sub update { 400sub update {
429 my ($self) = @_; 401 my ($self) = @_;
430 402
… …
527 499
528 $self 500 $self
529} 501}
530 502
531sub add { 503sub add {
532 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
533 505
534 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
535 508
536 use sort 'stable'; 509 use sort 'stable';
537 510
538 $self->{children} = [ 511 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
541 ]; 514 ];
542 515
543 $child->check_size; 516 $self->check_size (1);
517 $self->update;
544} 518}
545 519
546sub children { 520sub children {
547 @{ $_[0]{children} } 521 @{ $_[0]{children} }
548} 522}
… …
567 541
568 for (@$children) { 542 for (@$children) {
569 delete $_->{parent}; 543 delete $_->{parent};
570 $_->hide; 544 $_->hide;
571 } 545 }
546
547 $self->check_size;
548 $self->update;
572} 549}
573 550
574sub find_widget { 551sub find_widget {
575 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
576 553
… …
651} 628}
652 629
653sub update { 630sub update {
654 my ($self) = @_; 631 my ($self) = @_;
655 632
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 634 $self->SUPER::update;
658} 635}
659 636
660sub size_allocate { 637sub size_allocate {
661 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
662 639
663 $self->SUPER::size_allocate ($w, $h); 640 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 641 $self->update;
642}
643
644sub _render {
645 $_[0]{children}[0]->draw;
665} 646}
666 647
667sub render_child { 648sub render_child {
668 my ($self) = @_; 649 my ($self) = @_;
669 650
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 652 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 653 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 654
655 $self->_render;
674# glColorMask 1, 1, 1, 0; 656# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 657# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 659# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 660# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
687 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
688 670
689 my $tex = $self->{texture} 671 my $tex = $self->{texture}
690 or return; 672 or return;
691 673
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 676 glColor 0, 0, 0, 1;
697 677
698 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 679
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
702} 681}
703 682
704############################################################################# 683#############################################################################
705 684
706package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
707 686
708our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
709 688
710sub new { die }
711
712sub size_request { 689sub size_request {
713 my ($self) = @_; 690 my ($self) = @_;
714 691
715 @$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)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 694
718 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
719} 696}
720 697
721sub _draw { 698sub size_allocate {
722 my ($self) = @_; 699 my ($self, $w, $h) = @_;
723 700
724 $self->{children}[1]->draw; 701 $self->update;
725} 702}
726 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
727 706
728############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
729 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
730package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
731 752
732our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 754
736sub new { 755sub new {
737 my $class = shift; 756 my $class = shift;
738 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
739 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
741 border_bg => [1, 1, 1, 1], 770 slider => $slider,
742 border => 0.8,
743 @_ 771 @_,
744 ); 772 );
745 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
746 $self 778 $self
747} 779}
748 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
749sub _draw { 801sub _draw {
750 my ($self) = @_; 802 my ($self) = @_;
751 803
752 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
753 806
754 glEnable GL_BLEND; 807 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 810
759# glBegin GL_QUADS; 811 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 812 glVertex 0 , 0;
762# glVertex 0 , $h; 813 glVertex 0 , $h;
763# glVertex $w, $h; 814 glVertex $w, $h;
764# glVertex $w, 0; 815 glVertex $w, 0;
765# glEnd; 816 glEnd;
766 817
767
768 $self->child->draw;
769 glDisable GL_BLEND; 818 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
771} 822}
772 823
773############################################################################# 824#############################################################################
774 825
775package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
788 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
789 840
790 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
793 border => 0.8, 844 border => 0.6,
794 can_events => 1, 845 can_events => 1,
795 @_ 846 @_
796 ); 847 );
797 848
798 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 850 align => 0,
800 valign => 1, 851 valign => 1,
801 text => $self->{title}, 852 text => $self->{title},
802 fontsize => 1; 853 fontsize => $self->{border};
803 854
804 $self 855 $self
805} 856}
806 857
807sub border { 858sub border {
… …
832} 883}
833 884
834sub button_down { 885sub button_down {
835 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
836 887
888 my ($w, $h) = @$self{qw(w h)};
837 my $border = $self->border; 889 my $border = $self->border;
838 890
839 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
840 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
841 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
842 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
843 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
844 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
845 $self->{motion} = sub { 902 $self->{motion} = sub {
846 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
847 904
848 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
849 907
850 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
851 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
852 $self->check_size; 911 $self->check_size;
853 }; 912 };
854 913
855 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
856 && $y >= 0 && $y < $border) {
857
858 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
859 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
860 917
861 $self->{motion} = sub { 918 $self->{motion} = sub {
862 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
885 my ($self) = @_; 942 my ($self) = @_;
886 943
887 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
888 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
889 946
890 glEnable GL_BLEND;
891 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
892 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
894 949
895 my $border = $self->border; 950 my $border = $self->border;
896 951
897 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
898 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
899 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
900 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
901 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
902 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
903 my $bg = $tex[0]; 959 my $bg = $tex[0];
904 960
905 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
906 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
907 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
908 964
909 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
910 966
911 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
912 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
913 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
914 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
915 972
916 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
917 glDisable GL_BLEND;
918 974
919 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
920 $self->child->draw; 977 $self->child->draw;
921} 978}
922 979
923############################################################################# 980#############################################################################
924 981
… …
1148} 1205}
1149 1206
1150sub size_allocate { 1207sub size_allocate {
1151 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1152 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1153 my $children = $self->{children}; 1212 my $children = $self->{children};
1154 1213
1155 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1156 1215
1157 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1196 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1197 1256
1198 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1199 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1200 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1201 fontsize => 1, 1263 fontsize => 1,
1202 text => "",
1203 align => -1, 1264 align => -1,
1204 valign => -1, 1265 valign => -1,
1205 padding => 2, 1266 padding => 2,
1206 layout => new CFClient::Layout,
1207 can_events => 0, 1267 can_events => 0,
1208 %arg 1268 %arg
1209 ); 1269 );
1210 1270
1211 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1212 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1213 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1214 $self->{template} = $layout; 1274 $self->{template} = $layout;
1215 } 1275 }
1216 1276
1217 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1218 $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 }
1219 1282
1220 $self 1283 $self
1221} 1284}
1222 1285
1223sub escape { 1286sub escape {
… …
1235 1298
1236 delete $self->{texture}; 1299 delete $self->{texture};
1237 $self->SUPER::update; 1300 $self->SUPER::update;
1238} 1301}
1239 1302
1240sub reconfigure {
1241 my ($self) = @_;
1242
1243 delete $self->{texture};
1244}
1245
1246sub set_text { 1303sub set_text {
1247 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1248 1305
1249 return if $self->{text} eq "T$text"; 1306 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text"; 1307 $self->{text} = "T$text";
1251 1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1252 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1253 1311
1254 delete $self->{texture};
1255 $self->update; 1312 $self->update;
1256 $self->check_size; 1313 $self->check_size;
1257} 1314}
1258 1315
1259sub set_markup { 1316sub set_markup {
1260 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1261 1318
1262 return if $self->{text} eq "M$markup"; 1319 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup"; 1320 $self->{text} = "M$markup";
1264 1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1265 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1266 1326
1267 delete $self->{texture};
1268 $self->update; 1327 $self->update;
1269 $self->check_size; 1328 $self->check_size;
1270} 1329}
1271 1330
1272sub size_request { 1331sub size_request {
… …
1303sub set_fontsize { 1362sub set_fontsize {
1304 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1305 1364
1306 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1307 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1308 $self->check_size; 1369 $self->check_size;
1309 $self->update;
1310} 1370}
1311 1371
1312sub _draw { 1372sub _draw {
1313 my ($self) = @_; 1373 my ($self) = @_;
1314 1374
1315 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1316 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1317 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1318 $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
1319 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
1320 }; 1392 };
1321 1393
1322 glEnable GL_BLEND;
1323 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1324 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1325 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1326 1396
1397 if ($tex->{format} == GL_ALPHA) {
1327 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1328
1329 $self->{ox} = int (
1330 $self->{align} < 0 ? $self->{padding}
1331 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1332 : ($self->{w} - $tex->{w}) * 0.5
1333 );
1334
1335 $self->{oy} = int (
1336 $self->{valign} < 0 ? $self->{padding}
1337 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1338 : ($self->{h} - $tex->{h}) * 0.5
1339 );
1340
1341 $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 }
1342 1403
1343 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1344 glDisable GL_BLEND;
1345} 1405}
1346 1406
1347############################################################################# 1407#############################################################################
1348 1408
1349package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1384 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1385 1445
1386 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1387} 1447}
1388 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
1389sub get_text { 1458sub get_text {
1390 $_[0]{text} 1459 $_[0]{text}
1391} 1460}
1392 1461
1393sub size_request { 1462sub size_request {
… …
1400 1469
1401sub size_allocate { 1470sub size_allocate {
1402 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1403 1472
1404 $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
1405}
1406
1407sub set_text {
1408 my ($self, $text) = @_;
1409
1410 $self->{cursor} = length $text;
1411 $self->_set_text ($text);
1412 $self->update;
1413} 1474}
1414 1475
1415sub key_down { 1476sub key_down {
1416 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1417 1478
… …
1419 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1420 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1421 1482
1422 my $text = $self->get_text; 1483 my $text = $self->get_text;
1423 1484
1424 if ($sym == 8) { 1485 if ($uni == 8) {
1425 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1426 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1427 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1428 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1429 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1430 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1431 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1432 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1433 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1434 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1435 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1436 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1437 $self->emit ('escape'); 1498 $self->emit ('escape');
1438 } elsif ($uni) { 1499 } elsif ($uni) {
1439 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1440 } 1501 }
1441 1502
… …
1605 1666
1606 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1607 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1608 } 1669 }
1609 1670
1610 glEnable GL_BLEND;
1611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1612 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1614 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1615 1674
1616 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1617 1676
1618 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1619 glDisable GL_BLEND;
1620 1678
1621 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1622} 1680}
1623 1681
1624############################################################################# 1682#############################################################################
… …
1671 1729
1672 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;
1673 1731
1674 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1675 1733
1676 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1677 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679
1680 my $tex = $self->{state} ? $tex[1] : $tex[0];
1681
1682 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1683
1684 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1685 glDisable GL_BLEND;
1686} 1739}
1687 1740
1688############################################################################# 1741#############################################################################
1689 1742
1690package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1733 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1734 1787
1735 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1736 } 1789 }
1737 1790
1738 glEnable GL_BLEND;
1739 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1740 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 1793
1743 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1744 1795
1745 glDisable GL_BLEND;
1746 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1747} 1797}
1748 1798
1749############################################################################# 1799#############################################################################
1750 1800
… …
1948 # TODO: calculations are off 1998 # TODO: calculations are off
1949 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1950 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1951 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1952 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1953 req_w => 20, 2003 req_w => $::WIDTH / 80,
1954 req_h => 20, 2004 req_h => $::WIDTH / 80,
1955 vertical => 0, 2005 vertical => 0,
1956 can_hover => 1, 2006 can_hover => 1,
1957 inner_pad => 5, 2007 inner_pad => 5,
1958 @_ 2008 @_
1959 ); 2009 );
… …
2042 $page ||= 2; 2092 $page ||= 2;
2043 2093
2044 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2045 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2046 2096
2047 glEnable GL_BLEND;
2048 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2049 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2099
2052 # draw background 2100 # draw background
2053 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2054 2102
2055 # draw handle 2103 # draw handle
2056 $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);
2057 2105
2058 glDisable GL_BLEND;
2059 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
2060} 2107}
2061 2108
2062############################################################################# 2109#############################################################################
2063 2110
… …
2074 fontsize => 1, 2121 fontsize => 1,
2075 can_events => 0, 2122 can_events => 0,
2076 #font => default_font 2123 #font => default_font
2077 @_, 2124 @_,
2078 2125
2079 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
2080 par => [], 2127 par => [],
2081 height => 0, 2128 height => 0,
2082 children => [ 2129 children => [
2083 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
2084 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
2085 ], 2132 ],
2086 ); 2133 );
2087 2134
2088 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
2089 $self->update;
2090 });
2091 2136
2092 $self 2137 $self
2093} 2138}
2094 2139
2095sub set_fontsize { 2140sub set_fontsize {
… …
2103 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
2104 2149
2105 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
2106 2151
2107 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2108 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
2109 $layout->set_text ($text); 2154 $layout->set_markup ($text);
2110 2155
2111 ($layout->size)[1] 2156 ($layout->size)[1]
2112} 2157}
2113 2158
2114sub reflow { 2159sub reflow {
… …
2152 2197
2153 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2154 2199
2155 delete $self->{texture}; 2200 delete $self->{texture};
2156 2201
2157 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2158 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2159 my $height = 0; 2204 my $height = 0;
2160 2205
2161 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2162 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2166 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2167 2212
2168 delete $self->{texture}; 2213 delete $self->{texture};
2169 } 2214 }
2170 2215
2171 $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 {
2172 glClearColor 0, 0, 0, 0; 2217 glClearColor 0, 0, 0, 0;
2173 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2174 2219
2175 glEnable GL_BLEND;
2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2177 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2178 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2179 2222
2180 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2181 2224
… …
2190 2233
2191 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2192 my $h = $par->[0]; 2235 my $h = $par->[0];
2193 2236
2194 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2195 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2196 2240
2197 glColor @{ $par->[1] };
2198 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2199 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);
2200 } 2243 }
2201 2244
2202 $y += $h; 2245 $y += $h;
2203 } 2246 }
2204 2247
2205 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2206 glDisable GL_BLEND;
2207 }; 2249 };
2208 }); 2250 });
2209} 2251}
2210 2252
2211sub _draw { 2253sub _draw {
2212 my ($self) = @_; 2254 my ($self) = @_;
2213 2255
2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1; 2258 glColor 1, 1, 1, 1;
2220 $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});
2221 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2223 }
2224 2261
2225 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2226 2263
2227} 2264}
2228 2265
… …
2322 @_, 2359 @_,
2323 can_events => 0, 2360 can_events => 0,
2324 ) 2361 )
2325} 2362}
2326 2363
2327sub set_markup { 2364sub set_tooltip_from {
2328 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2329 2366
2330 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2331 $self->{label}->set_markup ($text); 2368 markup => $widget->{tooltip},
2332 $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 );
2333} 2374}
2334 2375
2335sub size_request { 2376sub size_request {
2336 my ($self) = @_; 2377 my ($self) = @_;
2337
2338 $self->child->set_max_size ($::WIDTH * 0.3);
2339 2378
2340 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2341 2380
2342 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2343} 2382}
… …
2349} 2388}
2350 2389
2351sub _draw { 2390sub _draw {
2352 my ($self) = @_; 2391 my ($self) = @_;
2353 2392
2354 glPushMatrix;
2355 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2356 2394
2357 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2358 2396
2359 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2370 glVertex 0 , $h; 2408 glVertex 0 , $h;
2371 glVertex $w, $h; 2409 glVertex $w, $h;
2372 glVertex $w, 0; 2410 glVertex $w, 0;
2373 glEnd; 2411 glEnd;
2374 2412
2375 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2376
2377 glTranslate 2, 2;
2378 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2379} 2415}
2380 2416
2381############################################################################# 2417#############################################################################
2382 2418
… …
2397 2433
2398sub size_request { 2434sub size_request {
2399 (32, 8) 2435 (32, 8)
2400} 2436}
2401 2437
2402sub draw { 2438sub _draw {
2403 my ($self) = @_; 2439 my ($self) = @_;
2404 2440
2441 return unless $::CONN;#d# manage and cache textures differently
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406 2443
2444 # TODO animation
2407 if ($tex) { 2445 if ($tex) {
2408 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D; 2446 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2412 glColor 1, 1, 1, 1; 2448 glColor 1, 1, 1, 1;
2413 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2414 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2415 glDisable GL_BLEND;
2416 } 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;
2417} 2729}
2418 2730
2419############################################################################# 2731#############################################################################
2420 2732
2421package CFClient::UI::Root; 2733package CFClient::UI::Root;
2422 2734
2423our @ISA = CFClient::UI::Container::; 2735our @ISA = CFClient::UI::Container::;
2424 2736
2425use CFClient::OpenGL; 2737use CFClient::OpenGL;
2426 2738
2427sub check_size { 2739sub new {
2428 my ($self) = @_; 2740 my $class = shift;
2429 2741
2430 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2742 $class->SUPER::new (
2431} 2743 @_,
2432 2744 )
2433sub size_request {
2434 ($::WIDTH, $::HEIGHT)
2435} 2745}
2436 2746
2437sub configure { 2747sub configure {
2438 my ($self, $x, $y, $w, $h) = @_; 2748 my ($self, $x, $y, $w, $h) = @_;
2439 2749
2440 $self->SUPER::configure ($x, $y, $w, $h); 2750 $self->{w} = $w;
2751 $self->{h} = $h;
2752}
2441 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
2442 for my $child (@{$self->{children}}) { 2786 for my $child ($self->children) {
2443 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)};
2444 2788
2445 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2789 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2446 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2447 $child->configure ($X, $Y, $W,$H); 2791 $child->configure ($X, $Y, $W, $H);
2448 } 2792 }
2449}
2450 2793
2451sub _topleft { 2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796}
2797
2798sub coord2local {
2452 my ($self, $x, $y) = @_; 2799 my ($self, $x, $y) = @_;
2453 2800
2454 ($x, $y) 2801 ($x, $y)
2455} 2802}
2456 2803
2804sub coord2global {
2805 my ($self, $x, $y) = @_;
2806
2807 ($x, $y)
2808}
2809
2457sub update { 2810sub update {
2458 my ($self) = @_; 2811 my ($self) = @_;
2459 2812
2460 $self->check_size; 2813 $self->check_size;
2461 ::refresh (); 2814 $::WANT_REFRESH++;
2462} 2815}
2463 2816
2464sub add { 2817sub add {
2465 my ($self, $child) = @_; 2818 my ($self, $child) = @_;
2466 2819
2467 # integerize window positions 2820 # integerise window positions
2468 $child->{x} = int $child->{x}; 2821 $child->{x} = int $child->{x};
2469 $child->{y} = int $child->{y}; 2822 $child->{y} = int $child->{y};
2470 2823
2471 $self->SUPER::add ($child); 2824 $self->SUPER::add ($child);
2472} 2825}
… …
2475 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2476 2829
2477 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2478} 2831}
2479 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2480sub draw { 2839sub draw {
2481 my ($self) = @_; 2840 my ($self) = @_;
2482 2841
2483 while (my $rcb = delete $self->{refresh_hook}) { 2842 while ($self->{refresh_hook}) {
2484 $_->() 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}};
2485 } 2895 }
2486 2896
2487 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2488 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2489 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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