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.164 by root, Mon Apr 24 06:57:39 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
… …
492sub new { 488sub new {
493 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
494 490
495 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
496 492
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 493 my $self = $class->SUPER::new (
494 children => [],
495 can_events => 0,
496 %arg,
497 );
498 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
499 499
500 $self 500 $self
501} 501}
502 502
503sub add { 503sub add {
504 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
505 505
506 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
507 508
508 use sort 'stable'; 509 use sort 'stable';
509 510
510 $self->{children} = [ 511 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
513 ]; 514 ];
514 515
515 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
516} 522}
517 523
518sub remove { 524sub remove {
519 my ($self, $child) = @_; 525 my ($self, $child) = @_;
520 526
… …
535 541
536 for (@$children) { 542 for (@$children) {
537 delete $_->{parent}; 543 delete $_->{parent};
538 $_->hide; 544 $_->hide;
539 } 545 }
546
547 $self->check_size;
548 $self->update;
540} 549}
541 550
542sub find_widget { 551sub find_widget {
543 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
544 553
… …
619} 628}
620 629
621sub update { 630sub update {
622 my ($self) = @_; 631 my ($self) = @_;
623 632
624 # we want to do this delayed... 633 $ROOT->on_refresh ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 634 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 635}
638 636
639sub size_allocate { 637sub size_allocate {
640 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
641 639
642 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
643 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
644 $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 };
645} 664}
646 665
647sub _draw { 666sub _draw {
648 my ($self) = @_; 667 my ($self) = @_;
649 668
650 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
651 670
652 my $tex = $self->{texture} 671 my $tex = $self->{texture}
653 or return; 672 or return;
654 673
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
658 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;
659 677
660 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 679
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
664} 681}
665 682
666############################################################################# 683#############################################################################
667 684
668package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
669 686
670our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
671 688
672sub new { die }
673
674sub size_request { 689sub size_request {
675 my ($self) = @_; 690 my ($self) = @_;
676 691
677 @$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)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
679 694
680 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
681} 696}
682 697
683sub _draw { 698sub size_allocate {
684 my ($self) = @_; 699 my ($self, $w, $h) = @_;
685 700
686 $self->{children}[1]->draw; 701 $self->update;
687} 702}
688 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
689 706
690############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
691 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
692package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
693 752
694our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
695
696use CFClient::OpenGL;
697 754
698sub new { 755sub new {
699 my $class = shift; 756 my $class = shift;
700 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
701 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
703 border_bg => [1, 1, 1, 1], 770 slider => $slider,
704 border => 0.8,
705 @_ 771 @_,
706 ); 772 );
707 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
708 $self 778 $self
709} 779}
710 780
711sub _draw { 781#TODO# update range on size_allocate depeneing on child
712 my ($self) = @_; 782# update viewport offset on scroll
713 783
714 my ($w, $h) = ($self->{w}, $self->{h}); 784#############################################################################
715 785
716 glEnable GL_BLEND; 786package CFClient::UI::Frame;
717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
718 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720 787
721# glBegin GL_QUADS; 788our @ISA = CFClient::UI::Bin::;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728 789
729 790use CFClient::OpenGL;
730 $self->child->draw;
731 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733}
734 791
735############################################################################# 792#############################################################################
736 793
737package CFClient::UI::FancyFrame; 794package CFClient::UI::FancyFrame;
738 795
… …
750 # TODO: user_x, user_y, overwrite moveto? 807 # TODO: user_x, user_y, overwrite moveto?
751 808
752 my $self = $class->SUPER::new ( 809 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 810 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 811 border_bg => [1, 1, 1, 1],
755 border => 0.8, 812 border => 0.6,
756 can_events => 0, 813 can_events => 1,
757 @_ 814 @_
758 ); 815 );
759 816
760 $self->{title} &&= new CFClient::UI::Label 817 $self->{title} &&= new CFClient::UI::Label
761 align => 0, 818 align => 0,
762 valign => 1, 819 valign => 1,
763 text => $self->{title}, 820 text => $self->{title},
764 fontsize => 1; 821 fontsize => $self->{border};
765 822
766 $self 823 $self
767} 824}
768 825
769sub border { 826sub border {
… …
794} 851}
795 852
796sub button_down { 853sub button_down {
797 my ($self, $ev, $x, $y) = @_; 854 my ($self, $ev, $x, $y) = @_;
798 855
856 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 857 my $border = $self->border;
800 858
801 if ($x < $self->{w} && $x >= $self->{w} - $border 859 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 860 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 861
862 if ($lr & $td) {
863 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 865 my ($bw, $bh) = ($self->{w}, $self->{h});
806 866
867 my $mx = $x < $border;
868 my $my = $y < $border;
869
807 $self->{motion} = sub { 870 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 871 my ($ev, $x, $y) = @_;
809 872
810 ($x, $y) = ($ev->{x}, $ev->{y}); 873 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy;
811 875
812 $self->{user_w} = $bw + $x - $ox; 876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
814 $self->check_size; 879 $self->check_size;
815 }; 880 };
816 881
817 } elsif ($x >= 0 && $x < $self->{w} 882 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 883 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 884 my ($bx, $by) = ($self->{x}, $self->{y});
822 885
823 $self->{motion} = sub { 886 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 887 my ($ev, $x, $y) = @_;
… …
847 my ($self) = @_; 910 my ($self) = @_;
848 911
849 my ($w, $h ) = ($self->{w}, $self->{h}); 912 my ($w, $h ) = ($self->{w}, $self->{h});
850 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
851 914
852 glEnable GL_BLEND;
853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
854 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
856 917
857 my $border = $self->border; 918 my $border = $self->border;
858 919
859 glColor @{ $self->{border_bg} }; 920 glColor @{ $self->{border_bg} };
860 $tex[1]->draw_quad (0, 0, $w, $border); 921 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
864 925
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
865 my $bg = $tex[0]; 927 my $bg = $tex[0];
866 928
867 # TODO: repeat texture not scale 929 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 930 my $rep_x = $cw / $bg->{w};
869 my $rep_y = $ch / $bg->{h}; 931 my $rep_y = $ch / $bg->{h};
870 932
871 glColor @{ $self->{bg} }; 933 glColor @{ $self->{bg} };
872 934
873 $bg->{s} = $rep_x; 935 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y; 936 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1; 937 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 938 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 }
877 940
878 glDisable GL_TEXTURE_2D; 941 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND;
880 942
881 $self->{title}->draw if $self->{title}; 943 $self->{title}->draw if $self->{title};
944
882 $self->child->draw; 945 $self->child->draw;
883} 946}
884 947
885############################################################################# 948#############################################################################
886 949
… …
908 $self->{children}[$y][$x] = $child; 971 $self->{children}[$y][$x] = $child;
909 972
910 $child->check_size; 973 $child->check_size;
911} 974}
912 975
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
913# 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?
914sub clear { 981sub clear {
915 my ($self) = @_; 982 my ($self) = @_;
916 983
917 my $children = delete $self->{children}; 984 my @children = $self->children;
985 delete $self->{children};
918 986
919 for (grep $_, map @$_, grep $_, @$children) { 987 for (@children) {
920 delete $_->{parent}; 988 delete $_->{parent};
921 $_->hide; 989 $_->hide;
922 } 990 }
923 991
924 $self->update; 992 $self->update;
… …
1105} 1173}
1106 1174
1107sub size_allocate { 1175sub size_allocate {
1108 my ($self, $w, $h) = @_; 1176 my ($self, $w, $h) = @_;
1109 1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1110 my $children = $self->{children}; 1180 my $children = $self->{children};
1111 1181
1112 my @h = map $_->{req_h}, @$children; 1182 my @h = map $_->{req_h}, @$children;
1113 1183
1114 my $req_h = List::Util::sum @h; 1184 my $req_h = List::Util::sum @h;
… …
1153 my ($class, %arg) = @_; 1223 my ($class, %arg) = @_;
1154 1224
1155 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1226 fg => [1, 1, 1],
1157 #font => default_font 1227 #font => default_font
1228 #text => initial text
1229 #markup => initial narkup
1230 layout => (new CFClient::Layout),
1158 fontsize => 1, 1231 fontsize => 1,
1159 text => "",
1160 align => -1, 1232 align => -1,
1161 valign => -1, 1233 valign => -1,
1162 padding => 2, 1234 padding => 2,
1163 layout => new CFClient::Layout,
1164 can_events => 0, 1235 can_events => 0,
1165 %arg 1236 %arg
1166 ); 1237 );
1167 1238
1168 if (exists $self->{template}) { 1239 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout; 1240 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template}); 1241 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout; 1242 $self->{template} = $layout;
1172 } 1243 }
1173 1244
1174 $self->set_text (delete $self->{text}) if exists $self->{text}; 1245 if (exists $self->{markup}) {
1175 $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 }
1176 1250
1177 $self 1251 $self
1178} 1252}
1179 1253
1180sub escape { 1254sub escape {
… …
1185 s/</&lt;/g; 1259 s/</&lt;/g;
1186 1260
1187 $_[1] 1261 $_[1]
1188} 1262}
1189 1263
1264sub update {
1265 my ($self) = @_;
1266
1267 delete $self->{texture};
1268 $self->SUPER::update;
1269}
1270
1190sub set_text { 1271sub set_text {
1191 my ($self, $text) = @_; 1272 my ($self, $text) = @_;
1192 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;
1193 $self->{layout}->set_text ($text); 1278 $self->{layout}->set_text ($text);
1194 1279
1195 delete $self->{texture}; 1280 $self->update;
1196 $self->check_size; 1281 $self->check_size;
1197 $self->update;
1198} 1282}
1199 1283
1200sub set_markup { 1284sub set_markup {
1201 my ($self, $markup) = @_; 1285 my ($self, $markup) = @_;
1202 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;
1203 $self->{layout}->set_markup ($markup); 1293 $self->{layout}->set_markup ($markup);
1204 1294
1205 delete $self->{texture}; 1295 $self->update;
1206 $self->check_size; 1296 $self->check_size;
1207 $self->update;
1208} 1297}
1209 1298
1210sub size_request { 1299sub size_request {
1211 my ($self) = @_; 1300 my ($self) = @_;
1212 1301
… …
1241sub set_fontsize { 1330sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1331 my ($self, $fontsize) = @_;
1243 1332
1244 $self->{fontsize} = $fontsize; 1333 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1334 delete $self->{texture};
1335
1336 $self->update;
1246 $self->check_size; 1337 $self->check_size;
1247 $self->update;
1248} 1338}
1249 1339
1250sub _draw { 1340sub _draw {
1251 my ($self) = @_; 1341 my ($self) = @_;
1252 1342
1253 my $tex = $self->{texture} ||= do { 1343 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1345 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $self->{layout}->set_width ($self->{w}); 1346 $self->{layout}->set_width ($self->{w});
1256 $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
1257 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
1258 }; 1360 };
1259 1361
1260 glEnable GL_BLEND;
1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1262 glEnable GL_TEXTURE_2D; 1362 glEnable GL_TEXTURE_2D;
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1364
1365 if ($tex->{format} == GL_ALPHA) {
1265 glColor @{$self->{fg}}; 1366 glColor @{$self->{fg}};
1266
1267 $self->{ox} = int (
1268 $self->{align} < 0 ? $self->{padding}
1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1272
1273 $self->{oy} = int (
1274 $self->{valign} < 0 ? $self->{padding}
1275 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276 : ($self->{h} - $tex->{h}) * 0.5
1277 );
1278
1279 $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 }
1280 1371
1281 glDisable GL_TEXTURE_2D; 1372 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1373}
1284 1374
1285############################################################################# 1375#############################################################################
1286 1376
1287package CFClient::UI::EntryBase; 1377package CFClient::UI::EntryBase;
… …
1322 $self->{layout}->set_text ("$text "); 1412 $self->{layout}->set_text ("$text ");
1323 1413
1324 $self->emit (changed => $self->{text}); 1414 $self->emit (changed => $self->{text});
1325} 1415}
1326 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
1327sub get_text { 1426sub get_text {
1328 $_[0]{text} 1427 $_[0]{text}
1329} 1428}
1330 1429
1331sub size_request { 1430sub size_request {
… …
1338 1437
1339sub size_allocate { 1438sub size_allocate {
1340 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1341 1440
1342 $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
1343}
1344
1345sub set_text {
1346 my ($self, $text) = @_;
1347
1348 $self->{cursor} = length $text;
1349 $self->_set_text ($text);
1350 $self->update;
1351} 1442}
1352 1443
1353sub key_down { 1444sub key_down {
1354 my ($self, $ev) = @_; 1445 my ($self, $ev) = @_;
1355 1446
… …
1462 my ($self, $ev) = @_; 1553 my ($self, $ev) = @_;
1463 1554
1464 my $sym = $ev->{sym}; 1555 my $sym = $ev->{sym};
1465 1556
1466 if ($sym == 13) { 1557 if ($sym == 13) {
1558 unshift @{$self->{history}},
1559 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1562 $self->emit (activate => $txt);
1468 $self->update; 1563 $self->update;
1564
1565 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text;
1568 }
1569 if (@{$self->{history} || []} > 0) {
1570 $self->{history_pointer}++;
1571 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1572 $self->{history_pointer} = @{$self->{history} || []} - 1;
1573 }
1574 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1575 }
1576
1577 } elsif ($sym == CFClient::SDLK_DOWN) {
1578 $self->{history_pointer}--;
1579 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1580
1581 if ($self->{history_pointer} >= 0) {
1582 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1583 } else {
1584 $self->set_text ($self->{history_saveback});
1585 }
1469 1586
1470 } else { 1587 } else {
1471 $self->SUPER::key_down ($ev); 1588 $self->SUPER::key_down ($ev);
1472 } 1589 }
1473 1590
… …
1517 1634
1518 if ($GRAB == $self) { 1635 if ($GRAB == $self) {
1519 $self->{fg} = $self->{active_fg}; 1636 $self->{fg} = $self->{active_fg};
1520 } 1637 }
1521 1638
1522 glEnable GL_BLEND;
1523 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526 glColor 0, 0, 0, 1; 1641 glColor 0, 0, 0, 1;
1527 1642
1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1643 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529 1644
1530 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1531 glDisable GL_BLEND;
1532 1646
1533 $self->SUPER::_draw; 1647 $self->SUPER::_draw;
1534} 1648}
1535 1649
1536############################################################################# 1650#############################################################################
… …
1583 1697
1584 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;
1585 1699
1586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587 1701
1588 glEnable GL_BLEND; 1702 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703
1589 glEnable GL_TEXTURE_2D; 1704 glEnable GL_TEXTURE_2D;
1590 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1591
1592 my $tex = $self->{state} ? $tex[1] : $tex[0];
1593
1594 $tex->draw_quad (0, 0, $s, $s); 1705 $tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596 glDisable GL_TEXTURE_2D; 1706 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598} 1707}
1599 1708
1600############################################################################# 1709#############################################################################
1601 1710
1602package CFClient::UI::Image; 1711package CFClient::UI::Image;
… …
1645 glTranslate 0, -$self->{w}, 0; 1754 glTranslate 0, -$self->{w}, 0;
1646 1755
1647 ($w, $h) = ($h, $w); 1756 ($w, $h) = ($h, $w);
1648 } 1757 }
1649 1758
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 1761
1655 $tex->draw_quad (0, 0, $w, $h); 1762 $tex->draw_quad_alpha (0, 0, $w, $h);
1656 1763
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D; 1764 glDisable GL_TEXTURE_2D;
1659} 1765}
1660 1766
1661############################################################################# 1767#############################################################################
1662 1768
… …
1710} 1816}
1711 1817
1712sub set_max { 1818sub set_max {
1713 my ($self, $max) = @_; 1819 my ($self, $max) = @_;
1714 1820
1821 return if $self->{max_val} == $max;
1822
1715 $self->{max_val} = $max; 1823 $self->{max_val} = $max;
1824 $self->update;
1716} 1825}
1717 1826
1718sub set_value { 1827sub set_value {
1719 my ($self, $val, $max) = @_; 1828 my ($self, $val, $max) = @_;
1720 1829
1721 $self->set_max ($max) 1830 $self->set_max ($max)
1722 if defined $max; 1831 if defined $max;
1723 1832
1724 $max = $self->{max_val}; 1833 return if $self->{val} == $val;
1834
1725 $self->{val} = $val; 1835 $self->{val} = $val;
1726
1727 $self->update; 1836 $self->update;
1728} 1837}
1729 1838
1730sub _draw { 1839sub _draw {
1731 my ($self) = @_; 1840 my ($self) = @_;
… …
1794 1903
1795sub new { 1904sub new {
1796 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1797 1906
1798 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 1908 tooltip => $arg{type},
1800 can_hover => 1, 1909 can_hover => 1,
1910 can_events => 1,
1801 %arg, 1911 %arg,
1802 ); 1912 );
1803 1913
1804 $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");
1805 $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);
… …
1813 1923
1814 $self->{value}->set_fontsize ($fsize); 1924 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize); 1925 $self->{max} ->set_fontsize ($fsize);
1816} 1926}
1817 1927
1928sub set_max {
1929 my ($self, $max) = @_;
1930
1931 $self->{gauge}->set_max ($max);
1932 $self->{max}->set_text ($max);
1933}
1934
1818sub set_value { 1935sub set_value {
1819 my ($self, $val, $max) = @_; 1936 my ($self, $val, $max) = @_;
1820 1937
1821 $self->set_max ($max) 1938 $self->set_max ($max)
1822 if defined $max; 1939 if defined $max;
1823 1940
1824 $self->{gauge}->set_value ($val, $max); 1941 $self->{gauge}->set_value ($val, $max);
1825 $self->{value}->set_text ($val); 1942 $self->{value}->set_text ($val);
1826}
1827
1828sub set_max {
1829 my ($self, $max) = @_;
1830
1831 $self->{gauge}->set_max ($max);
1832 $self->{max}->set_text ($max);
1833} 1943}
1834 1944
1835############################################################################# 1945#############################################################################
1836 1946
1837package CFClient::UI::Slider; 1947package CFClient::UI::Slider;
… …
1856 # TODO: calculations are off 1966 # TODO: calculations are off
1857 my $self = $class->SUPER::new ( 1967 my $self = $class->SUPER::new (
1858 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1859 active_fg => [0, 0, 0], 1969 active_fg => [0, 0, 0],
1860 range => [0, 0, 100, 10], 1970 range => [0, 0, 100, 10],
1861 req_w => 20, 1971 req_w => $::WIDTH / 80,
1862 req_h => 20, 1972 req_h => $::WIDTH / 80,
1863 vertical => 0, 1973 vertical => 0,
1864 can_hover => 1, 1974 can_hover => 1,
1865 inner_pad => 5, 1975 inner_pad => 5,
1866 @_ 1976 @_
1867 ); 1977 );
… …
1950 $page ||= 2; 2060 $page ||= 2;
1951 2061
1952 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1953 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1954 2064
1955 glEnable GL_BLEND;
1956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1957 glEnable GL_TEXTURE_2D; 2065 glEnable GL_TEXTURE_2D;
1958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1959 2067
1960 # draw background 2068 # draw background
1961 $tex[1]->draw_quad (0, 0, $w, $h); 2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1962 2070
1963 # draw handle 2071 # draw handle
1964 $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);
1965 2073
1966 glDisable GL_BLEND;
1967 glDisable GL_TEXTURE_2D; 2074 glDisable GL_TEXTURE_2D;
1968} 2075}
1969 2076
1970############################################################################# 2077#############################################################################
1971 2078
… …
1982 fontsize => 1, 2089 fontsize => 1,
1983 can_events => 0, 2090 can_events => 0,
1984 #font => default_font 2091 #font => default_font
1985 @_, 2092 @_,
1986 2093
1987 layout => (new CFClient::Layout), 2094 layout => (new CFClient::Layout 1),
1988 par => [], 2095 par => [],
1989 height => 0, 2096 height => 0,
1990 children => [ 2097 children => [
1991 (new CFClient::UI::Empty expand => 1), 2098 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2099 (new CFClient::UI::Slider vertical => 1),
1993 ], 2100 ],
1994 ); 2101 );
1995 2102
1996 $self->{children}[1]->connect (changed => sub { 2103 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2104
2000 $self 2105 $self
2001} 2106}
2002 2107
2003sub set_fontsize { 2108sub set_fontsize {
… …
2011 my ($self, $text) = @_; 2116 my ($self, $text) = @_;
2012 2117
2013 my $layout = $self->{layout}; 2118 my $layout = $self->{layout};
2014 2119
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w}); 2121 $layout->set_width ($self->{children}[0]{w});
2017 $layout->set_text ($text); 2122 $layout->set_markup ($text);
2018 2123
2019 ($layout->size)[1] 2124 ($layout->size)[1]
2020} 2125}
2021 2126
2022sub reflow { 2127sub reflow {
… …
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2075 2180
2076 delete $self->{texture}; 2181 delete $self->{texture};
2077 } 2182 }
2078 2183
2079 $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 {
2080 glClearColor 0, 0, 0, 1; 2185 glClearColor 0, 0, 0, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2186 glClear GL_COLOR_BUFFER_BIT;
2082 2187
2083 glEnable GL_BLEND;
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D; 2188 glEnable GL_TEXTURE_2D;
2086 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2087 2190
2088 my $top = int $self->{children}[1]{range}[0]; 2191 my $top = int $self->{children}[1]{range}[0];
2089 2192
… …
2098 2201
2099 for my $par (@{$self->{par}}) { 2202 for my $par (@{$self->{par}}) {
2100 my $h = $par->[0]; 2203 my $h = $par->[0];
2101 2204
2102 if ($y0 < $y + $h && $y < $y1) { 2205 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] });
2103 $layout->set_text ($par->[2]); 2207 $layout->set_markup ($par->[2]);
2104 2208
2105 glColor @{ $par->[1] };
2106 my ($W, $H) = $layout->size; 2209 my ($W, $H) = $layout->size;
2107 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);
2108 } 2211 }
2109 2212
2110 $y += $h; 2213 $y += $h;
2111 } 2214 }
2112 2215
2113 glDisable GL_TEXTURE_2D; 2216 glDisable GL_TEXTURE_2D;
2114 glDisable GL_BLEND;
2115 }; 2217 };
2116 }); 2218 });
2117} 2219}
2118 2220
2119sub _draw { 2221sub _draw {
2120 my ($self) = @_; 2222 my ($self) = @_;
2121 2223
2122 if ($self->{texture}) {
2123 glEnable GL_TEXTURE_2D; 2224 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2125 $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});
2126 glDisable GL_TEXTURE_2D; 2228 glDisable GL_TEXTURE_2D;
2127 }
2128 2229
2129 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2130 2231
2131} 2232}
2132 2233
… …
2226 @_, 2327 @_,
2227 can_events => 0, 2328 can_events => 0,
2228 ) 2329 )
2229} 2330}
2230 2331
2231sub set_markup { 2332sub set_tooltip_from {
2232 my ($self, $text) = @_; 2333 my ($self, $widget) = @_;
2233 2334
2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2335 $self->add (new CFClient::UI::Label
2235 $self->{label}->set_markup ($text); 2336 markup => $widget->{tooltip},
2236 $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 );
2237} 2342}
2238 2343
2239sub size_request { 2344sub size_request {
2240 my ($self) = @_; 2345 my ($self) = @_;
2241
2242 $self->child->set_max_size ($::WIDTH * 0.3);
2243 2346
2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2245 2348
2246 ($w + 4, $h + 4) 2349 ($w + 4, $h + 4)
2247} 2350}
… …
2253} 2356}
2254 2357
2255sub _draw { 2358sub _draw {
2256 my ($self) = @_; 2359 my ($self) = @_;
2257 2360
2258 glPushMatrix;
2259 glTranslate 0.375, 0.375; 2361 glTranslate 0.375, 0.375;
2260 2362
2261 my ($w, $h) = @$self{qw(w h)}; 2363 my ($w, $h) = @$self{qw(w h)};
2262 2364
2263 glColor 1, 0.8, 0.4; 2365 glColor 1, 0.8, 0.4;
… …
2274 glVertex 0 , $h; 2376 glVertex 0 , $h;
2275 glVertex $w, $h; 2377 glVertex $w, $h;
2276 glVertex $w, 0; 2378 glVertex $w, 0;
2277 glEnd; 2379 glEnd;
2278 2380
2279 glPopMatrix; 2381 glTranslate 2 - 0.375, 2 - 0.375;
2280
2281 glTranslate 2, 2;
2282 $self->SUPER::_draw; 2382 $self->SUPER::_draw;
2283} 2383}
2284 2384
2285############################################################################# 2385#############################################################################
2286 2386
… …
2301 2401
2302sub size_request { 2402sub size_request {
2303 (32, 8) 2403 (32, 8)
2304} 2404}
2305 2405
2306sub draw { 2406sub _draw {
2307 my ($self) = @_; 2407 my ($self) = @_;
2308 2408
2409 return unless $::CONN;#d# manage and cache textures differently
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2310 2411
2412 # TODO animation
2311 if ($tex) { 2413 if ($tex) {
2312 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D; 2414 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2316 glColor 1, 1, 1, 1; 2416 glColor 1, 1, 1, 1;
2317 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2318 glDisable GL_TEXTURE_2D; 2418 glDisable GL_TEXTURE_2D;
2319 glDisable GL_BLEND;
2320 } 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;
2321} 2688}
2322 2689
2323############################################################################# 2690#############################################################################
2324 2691
2325package CFClient::UI::Root; 2692package CFClient::UI::Root;
2326 2693
2327our @ISA = CFClient::UI::Container::; 2694our @ISA = CFClient::UI::Container::;
2328 2695
2329use CFClient::OpenGL; 2696use CFClient::OpenGL;
2330 2697
2331sub check_size { 2698sub new {
2332 my ($self) = @_; 2699 my $class = shift;
2333 2700
2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2701 $class->SUPER::new (
2335} 2702 @_,
2336 2703 )
2337sub size_request {
2338 ($::WIDTH, $::HEIGHT)
2339} 2704}
2340 2705
2341sub configure { 2706sub configure {
2342 my ($self, $x, $y, $w, $h) = @_; 2707 my ($self, $x, $y, $w, $h) = @_;
2343 2708
2344 $self->SUPER::configure ($x, $y, $w, $h); 2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2345 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
2346 for my $child (@{$self->{children}}) { 2745 for my $child ($self->children) {
2347 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)};
2348 2747
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2748 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2350 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2351 $child->configure ($X, $Y, $W,$H); 2750 $child->configure ($X, $Y, $W, $H);
2352 } 2751 }
2353}
2354 2752
2355sub _topleft { 2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755}
2756
2757sub coord2local {
2356 my ($self, $x, $y) = @_; 2758 my ($self, $x, $y) = @_;
2357 2759
2358 ($x, $y) 2760 ($x, $y)
2359} 2761}
2360 2762
2763sub coord2global {
2764 my ($self, $x, $y) = @_;
2765
2766 ($x, $y)
2767}
2768
2361sub update { 2769sub update {
2362 my ($self) = @_; 2770 my ($self) = @_;
2363 2771
2364 $self->check_size; 2772 $self->check_size;
2365 ::refresh (); 2773 $::WANT_REFRESH++;
2366} 2774}
2367 2775
2368sub add { 2776sub add {
2369 my ($self, $child) = @_; 2777 my ($self, $child) = @_;
2370 2778
2371 # integerize window positions 2779 # integerise window positions
2372 $child->{x} = int $child->{x}; 2780 $child->{x} = int $child->{x};
2373 $child->{y} = int $child->{y}; 2781 $child->{y} = int $child->{y};
2374 2782
2375 $self->SUPER::add ($child); 2783 $self->SUPER::add ($child);
2376} 2784}
… …
2379 my ($self, $id, $cb) = @_; 2787 my ($self, $id, $cb) = @_;
2380 2788
2381 $self->{refresh_hook}{$id} = $cb; 2789 $self->{refresh_hook}{$id} = $cb;
2382} 2790}
2383 2791
2384sub draw { 2792sub draw {
2385 my ($self) = @_; 2793 my ($self) = @_;
2386 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
2387 while (my $rcb = delete $self->{refresh_hook}) { 2840 while ($self->{refresh_hook}) {
2388 $_->() for values %$rcb; 2841 $_->()
2842 for values %{delete $self->{refresh_hook}};
2389 } 2843 }
2390 2844
2391 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2845 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2392 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2393 glClear GL_COLOR_BUFFER_BIT; 2847 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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