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.77 by root, Tue Apr 11 22:14:13 2006 UTC vs.
Revision 1.101 by elmex, Fri Apr 14 11:43:51 2006 UTC

… …
79use SDL::OpenGL; 79use SDL::OpenGL;
80 80
81sub new { 81sub new {
82 my $class = shift; 82 my $class = shift;
83 83
84 bless { 84 my $self = bless {
85 x => 0, 85 x => 0,
86 y => 0, 86 y => 0,
87 z => 0, 87 z => 0,
88 w => -1, 88 w => -1,
89 h => -1, 89 h => -1,
90 @_ 90 @_
91 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
92} 100}
93 101
94sub move { 102sub move {
95 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 104 $self->{x} = $x;
… …
125 my ($self, $x, $y, $w, $h) = @_; 133 my ($self, $x, $y, $w, $h) = @_;
126 134
127 $self->_size_allocate ($x, $y, $w, $h); 135 $self->_size_allocate ($x, $y, $w, $h);
128} 136}
129 137
130# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
131sub translate { 139sub translate {
132 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
133 141
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
135} 143}
136 144
137sub focus_in { 145sub focus_in {
138 my ($self) = @_; 146 my ($self) = @_;
139 147
140 return if $FOCUS == $self; 148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
141 150
142 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
143 $focus->update if $focus; 152 $focus->update if $focus;
144 $FOCUS->update; 153 $FOCUS->update;
145} 154}
… …
178 glPushMatrix; 187 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 189 $self->_draw;
181 glPopMatrix; 190 glPopMatrix;
182 191
183 if ($self == $HOVER) { 192 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 193 my ($x, $y) = @$self{qw(x y)};
185 194
186 glColor 0, 0, 1, 0.2; 195 glColor 0, 0, 1, 0.2;
187 glEnable GL_BLEND; 196 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
200 my ($self) = @_; 209 my ($self) = @_;
201 210
202 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
203} 212}
204 213
205sub bbox {
206 my ($self) = @_;
207 my ($w, $h) = $self->size_request;
208 (
209 $self->{x},
210 $self->{y},
211 $self->{x} = $w,
212 $self->{y} = $h
213 )
214}
215
216sub find_widget { 214sub find_widget {
217 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
218 216
219 return $self 217 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 218 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 220
223 () 221 ()
224} 222}
225 223
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 224sub set_parent {
229 my ($self, $par) = @_; 225 my ($self, $par) = @_;
230 226
231 $self->{parent} = $par; 227 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
276 272
277 # range [value, low, high, page] 273 # range [value, low, high, page]
278 274
279 $class->SUPER::new ( 275 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2], 276 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 277 active_bg => [1, 1, 1, 0.5],
282 @_ 278 @_
283 ) 279 )
284} 280}
285 281
286sub _draw { 282sub _draw {
… …
534 530
535my @tex = 531my @tex =
536 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
537 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
538 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
539sub size_request { 548sub size_request {
540 my ($self) = @_; 549 my ($self) = @_;
541 550
542 my ($w, $h) = 551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
543 $self->{user_w} && $self->{user_h} 552
544 ? ($self->{user_w}, $self->{user_h})
545 : ($self->SUPER::size_request); 553 my ($w, $h) = $self->SUPER::size_request;
546 554
547 $h += $tex[1]->{h}; 555 (
548 $h += $tex[4]->{h}; 556 $w + $self->{border} * 2,
549 $w += $tex[2]->{w}; 557 $h + $self->{border} * 2,
550 $w += $tex[3]->{w}; 558 )
551
552 ($w, $h)
553} 559}
554 560
555sub size_allocate { 561sub size_allocate {
556 my ($self, $x, $y, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
557 563
558 $self->_size_allocate ($x, $y, $w, $h) or return; 564 $self->_size_allocate ($x, $y, $w, $h) or return;
559 565
560 $h -= $tex[1]{h}; 566 $h -= List::Util::max 0, $self->{border} * 2;
561 $h -= $tex[4]{h}; 567 $w -= List::Util::max 0, $self->{border} * 2;
562 $w -= $tex[2]{w};
563 $w -= $tex[3]{w};
564 568
565 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
566 $w = $w < 0 ? 0 : $w;
567
568 my $child = $self->child;
569
570 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
571} 570}
572 571
573sub button_down { 572sub button_down {
574 my ($self, $ev, $x, $y) = @_; 573 my ($self, $ev, $x, $y) = @_;
575 574
576 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
577 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
578 577
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580 my ($bw, $bh) = ($self->{w}, $self->{h}); 579 my ($bw, $bh) = ($self->{w}, $self->{h});
581 580
582 $self->{motion} = sub { 581 $self->{motion} = sub {
… …
588 $self->{user_h} = $bh + $y - $oy; 587 $self->{user_h} = $bh + $y - $oy;
589 $self->update; 588 $self->update;
590 }; 589 };
591 590
592 } elsif ($x >= 0 && $x < $self->{w} 591 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $tex[1]{h}) { 592 && $y >= 0 && $y < $self->{border}) {
594 593
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596 my ($bx, $by) = ($self->{x}, $self->{y}); 595 my ($bx, $by) = ($self->{x}, $self->{y});
597 596
598 $self->{motion} = sub { 597 $self->{motion} = sub {
… …
619} 618}
620 619
621sub _draw { 620sub _draw {
622 my ($self) = @_; 621 my ($self) = @_;
623 622
624 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
626 625
627 glEnable GL_BLEND; 626 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 630
632 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
633 $top->draw_quad (0, 0, $w, $top->{h}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
634 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
635 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
636 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
637
638 my $right = $tex[2];
639 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
640
641 my $bottom = $tex[4];
642 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
643 636
644 my $bg = $tex[0]; 637 my $bg = $tex[0];
645 638
646 glBindTexture GL_TEXTURE_2D, $bg->{name}; 639 # TODO: repeat texture not scale
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
648 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
649 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
650
651 my $rep_x = $cw / $bg->{w}; 640 my $rep_x = $cw / $bg->{w};
652 my $rep_y = $ch / $bg->{h}; 641 my $rep_y = $ch / $bg->{h};
653 642
643 glColor @{ $self->{bg} };
644
645 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1;
654 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
655 649
656 glDisable GL_TEXTURE_2D; 650 glDisable GL_TEXTURE_2D;
657 glDisable GL_BLEND; 651 glDisable GL_BLEND;
658 652
659 $self->child->draw; 653 $self->child->draw;
660
661} 654}
662 655
663############################################################################# 656#############################################################################
664 657
665package CFClient::UI::Table; 658package CFClient::UI::Table;
… …
667our @ISA = CFClient::UI::Base::; 660our @ISA = CFClient::UI::Base::;
668 661
669use List::Util qw(max sum); 662use List::Util qw(max sum);
670 663
671use SDL::OpenGL; 664use SDL::OpenGL;
665
666sub new {
667 my $class = shift;
668
669 $class->SUPER::new (
670 col_expand => [],
671 @_
672 )
673}
672 674
673sub add { 675sub add {
674 my ($self, $x, $y, $chld) = @_; 676 my ($self, $x, $y, $chld) = @_;
675 677
676 $self->{children}[$y][$x] = $chld; 678 $self->{children}[$y][$x] = $chld;
… …
706 my ($self) = @_; 708 my ($self) = @_;
707 709
708 my ($ws, $hs) = $self->get_wh; 710 my ($ws, $hs) = $self->get_wh;
709 711
710 ( 712 (
711 (List::Util::sum @$ws), 713 (sum @$ws),
712 (List::Util::sum @$hs), 714 (sum @$hs),
713 ) 715 )
714} 716}
715 717
716sub size_allocate { 718sub size_allocate {
717 my ($self, $x, $y, $w, $h) = @_; 719 my ($self, $x, $y, $w, $h) = @_;
718 720
719 $self->_size_allocate ($x, $y, $w, $h) or return; 721 $self->_size_allocate ($x, $y, $w, $h) or return;
720 722
721 my ($ws, $hs) = $self->get_wh; 723 my ($ws, $hs) = $self->get_wh;
722 724
723 my $req_w = List::Util::sum @$ws; 725 my $req_w = sum @$ws;
724 my $req_h = List::Util::sum @$hs; 726 my $req_h = sum @$hs;
727
728 # TODO: nicer code && do row_expand
729 my @col_expand = @{$self->{col_expand}};
730 @col_expand = (1) x @$ws unless @col_expand;
731 my $col_expand = (sum @col_expand) || 1;
725 732
726 # linearly scale sizes 733 # linearly scale sizes
727 $_ *= $w / $req_w for @$ws; 734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $_ *= $h / $req_h for @$hs; 735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729 736
730 my $y; 737 my $y;
731 738
732 for my $r (0 .. $#{$self->{children}}) { 739 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 740 my $row = $self->{children}[$r]
… …
735 742
736 my $x = 0; 743 my $x = 0;
737 my $row_h = $hs->[$r]; 744 my $row_h = $hs->[$r];
738 745
739 for my $c (0 .. $#$row) { 746 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 747 my $col_w = $ws->[$c];
744 748
749 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 750 $widget->size_allocate ($x, $y, $col_w, $row_h);
751 }
746 752
747 $x += $col_w; 753 $x += $col_w;
748 } 754 }
749 755
750 $y += $row_h; 756 $y += $row_h;
… …
796} 802}
797 803
798sub size_allocate { 804sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 805 my ($self, $x, $y, $w, $h) = @_;
800 806
801 $self->_size_allocate ($x, $y, $w, $h) or return; 807 $self->_size_allocate ($x, $y, $w, $h);
802
803 return unless $self->{w};
804 808
805 ($h, $w) = ($w, $h); 809 ($h, $w) = ($w, $h);
806 810
807 my $children = $self->{children}; 811 my $children = $self->{children};
808 812
… …
810 814
811 my $req_h = List::Util::sum @h; 815 my $req_h = List::Util::sum @h;
812 816
813 if ($req_h > $h) { 817 if ($req_h > $h) {
814 # ah well, not enough space 818 # ah well, not enough space
815 $_ = $h[$_] * $h / $req_h for @h; 819 $_ *= $h / $req_h for @h;
816 } else { 820 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children; 821 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1; 822 $exp ||= 1;
819 823
820 for (0 .. $#$children) { 824 for (0 .. $#$children) {
… …
856} 860}
857 861
858sub size_allocate { 862sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 863 my ($self, $x, $y, $w, $h) = @_;
860 864
861 $self->_size_allocate ($x, $y, $w, $h) or return; 865 $self->_size_allocate ($x, $y, $w, $h);
862
863 return unless $self->{h};
864 866
865 my $children = $self->{children}; 867 my $children = $self->{children};
866 868
867 my @h = map +($_->size_request)[1], @$children; 869 my @h = map +($_->size_request)[1], @$children;
868 870
869 my $req_h = List::Util::sum @h; 871 my $req_h = List::Util::sum @h;
870 872
871 if ($req_h > $h) { 873 if ($req_h > $h) {
872 # ah well, not enough space 874 # ah well, not enough space
873 $_ = $h[$_] * $h / $req_h for @h; 875 $_ *= $h / $req_h for @h;
874 } else { 876 } else {
875 my $exp = List::Util::sum map $_->{expand}, @$children; 877 my $exp = List::Util::sum map $_->{expand}, @$children;
876 $exp ||= 1; 878 $exp ||= 1;
877 879
878 for (0 .. $#$children) { 880 for (0 .. $#$children) {
… …
933 935
934 $self->{text} = $text; 936 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 937 $self->{layout}->set_markup ($text);
936 938
937 delete $self->{texture}; 939 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
938 $self->update; 941 $self->update;
939} 942}
940 943
941sub get_text { 944sub get_text {
942 my ($self, $text) = @_; 945 my ($self, $text) = @_;
… …
975sub _draw { 978sub _draw {
976 my ($self) = @_; 979 my ($self) = @_;
977 980
978 my $tex = $self->{texture} ||= do { 981 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 982 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
980 new_from_layout CFClient::Texture $self->{layout} 984 new_from_layout CFClient::Texture $self->{layout}
981 }; 985 };
982 986
983 glEnable GL_BLEND; 987 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
990 my $x = 994 my $x =
991 $self->{align} < 0 ? $self->{padding} 995 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 997 : ($self->{w} - $tex->{w}) * 0.5;
994 998
995 $tex->draw_quad ($x, $self->{padding}); 999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
1000 $tex->draw_quad (0, 0);
996 1001
997 glDisable GL_TEXTURE_2D; 1002 glDisable GL_TEXTURE_2D;
998 glDisable GL_BLEND; 1003 glDisable GL_BLEND;
999} 1004}
1000 1005
… …
1011 my $class = shift; 1016 my $class = shift;
1012 1017
1013 $class->SUPER::new ( 1018 $class->SUPER::new (
1014 fg => [1, 1, 1], 1019 fg => [1, 1, 1],
1015 bg => [0, 0, 0, 0.2], 1020 bg => [0, 0, 0, 0.2],
1016 active_bg => [1, 1, 1], 1021 active_bg => [1, 1, 1, 0.5],
1017 active_fg => [0, 0, 0], 1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
1018 @_ 1025 @_
1019 ) 1026 )
1020} 1027}
1021 1028
1022sub _set_text { 1029sub _set_text {
1023 my ($self, $text) = @_; 1030 my ($self, $text) = @_;
1024 1031
1032 my $old_text = $self->{text};
1033
1025 $self->{last_activity} = $::NOW; 1034 $self->{last_activity} = $::NOW;
1026 1035
1027 $self->{text} = $text; 1036 $self->{text} = $text;
1028 $self->{layout}->set_width ($self->{w}); 1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1029 1039
1030 $text =~ s/./*/g if $self->{hidden}; 1040 $text =~ s/./*/g if $self->{hidden};
1031 1041
1032 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1033 1043
1034 $text = substr $text, 0, $self->{cursor}; 1044 $text = substr $text, 0, $self->{cursor};
1035 utf8::encode $text; 1045 utf8::encode $text;
1036 1046
1037 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1038} 1051}
1039 1052
1040sub size_request { 1053sub size_request {
1041 my ($self) = @_; 1054 my ($self) = @_;
1042 1055
… …
1081 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1082 } elsif ($sym == SDLK_HOME) { 1095 } elsif ($sym == SDLK_HOME) {
1083 $self->{cursor} = 0; 1096 $self->{cursor} = 0;
1084 } elsif ($sym == SDLK_END) { 1097 } elsif ($sym == SDLK_END) {
1085 $self->{cursor} = length $text; 1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1086 } elsif ($uni) { 1101 } elsif ($uni) {
1087 substr $text, $self->{cursor}++, 0, chr $uni; 1102 substr $text, $self->{cursor}++, 0, chr $uni;
1088 } 1103 }
1089 1104
1090 $self->_set_text ($text); 1105 $self->_set_text ($text);
… …
1152 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1153 glEnd; 1168 glEnd;
1154 } 1169 }
1155} 1170}
1156 1171
1157#############################################################################
1158
1159package CFClient::UI::Slider; 1172package CFClient::UI::LineEntry;
1160 1173
1161use strict; 1174our @ISA = CFClient::UI::Entry::;
1162 1175
1176use SDL;
1163use SDL::OpenGL; 1177use SDL::OpenGL;
1164 1178
1179sub key_down {
1180 my ($self, $ev) = @_;
1181
1182 my $sym = $ev->key_sym;
1183
1184 if ($sym == SDLK_RETURN) {
1185 $self->emit (activate => $self->get_text);
1186 $self->update;
1187
1188 } else {
1189 $self->SUPER::key_down ($ev);
1190 }
1191
1192}
1193
1194#############################################################################
1195
1196package CFClient::UI::Button;
1197
1165our @ISA = CFClient::UI::DrawBG::; 1198our @ISA = CFClient::UI::Label::;
1199
1200use SDL;
1201use SDL::OpenGL;
1202
1203my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1205 qw(b1_button_active.png);
1166 1206
1167sub new { 1207sub new {
1168 my $class = shift; 1208 my $class = shift;
1169 1209
1210 $class->SUPER::new (
1211 padding => 4,
1212 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0],
1215 can_hover => 1,
1216 @_
1217 )
1218}
1219
1220sub button_up {
1221 my ($self, $ev, $x, $y) = @_;
1222
1223 if ($x >= 0 && $x < $self->{w}
1224 && $y >= 0 && $y < $self->{h}) {
1225 $self->emit ("activate");
1226 }
1227}
1228
1229sub _draw {
1230 my ($self) = @_;
1231
1232 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
1234
1235 glEnable GL_BLEND;
1236 glEnable GL_TEXTURE_2D;
1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238
1239 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg};
1241 }
1242
1243 glBindTexture GL_TEXTURE_2D, $tex->{name};
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1245
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1247
1248 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND;
1250
1251 $self->SUPER::_draw;
1252}
1253
1254#############################################################################
1255
1256package CFClient::UI::CheckBox;
1257
1258our @ISA = CFClient::UI::DrawBG::;
1259
1260use SDL;
1261use SDL::OpenGL;
1262
1263sub new {
1264 my $class = shift;
1265
1266 $class->SUPER::new (
1267 padding => 2,
1268 fg => [1, 1, 1],
1269 active_fg => [1, 1, 0],
1270 state => 0,
1271 can_hover => 1,
1272 @_
1273 )
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{padding} * 2 + 6) x 2
1280}
1281
1282sub size_allocate {
1283 my ($self, $x, $y, $w, $h) = @_;
1284
1285 $self->_size_allocate ($x, $y, $w, $h);
1286}
1287
1288sub button_down {
1289 my ($self, $ev, $x, $y) = @_;
1290
1291 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1292 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1293 $self->{state} = !$self->{state};
1294 $self->emit (changed => $self->{state});
1295 }
1296}
1297
1298sub _draw {
1299 my ($self) = @_;
1300
1301 $self->SUPER::_draw;
1302
1303 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1304
1305 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1306
1307 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1308
1309 glBegin GL_LINE_LOOP;
1310 glVertex 0 , 0;
1311 glVertex 0 , $s;
1312 glVertex $s, $s;
1313 glVertex $s, 0;
1314 glEnd;
1315
1316 if ($self->{state}) {
1317 glBegin GL_LINES;
1318 glVertex 0 , 0;
1319 glVertex $s, $s;
1320 glVertex $s, 0;
1321 glVertex 0 , $s;
1322 glEnd;
1323 }
1324}
1325
1326#############################################################################
1327
1328package CFClient::UI::Slider;
1329
1330use strict;
1331
1332use SDL::OpenGL;
1333
1334our @ISA = CFClient::UI::DrawBG::;
1335
1336my @tex =
1337 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1338 qw(s1_slider.png s1_slider_bg.png);
1339
1340sub new {
1341 my $class = shift;
1342
1170 # range [value, low, high, page] 1343 # range [value, low, high, page]
1171 1344
1345 # TODO: 0-width page
1346 # TODO: req_w/h are wrong with vertical
1347 # TODO: calculations are off
1172 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1173 fg => [1, 1, 1], 1349 fg => [1, 1, 1],
1174 active_fg => [0, 0, 0], 1350 active_fg => [0, 0, 0],
1175 range => [0, 0, 100, 10], 1351 range => [0, 0, 100, 10],
1176 req_w => 40, 1352 req_w => 40,
1177 req_h => 10, 1353 req_h => 13,
1178 vertical => 0, 1354 vertical => 0,
1355 can_hover => 1,
1179 @_ 1356 @_
1180 ); 1357 );
1181 1358
1182 $self 1359 $self
1183} 1360}
… …
1235 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1412 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1236 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1413 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1237 1414
1238 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1415 my ($value, $lo, $hi, $page) = @{$self->{range}};
1239 1416
1417 # the inner_* stuff is for generating a padding for the slider handle,
1418 # so that the handle doesn't leave the texture. This calculation isn't 100%
1419 # correct propably, but it does the job for now
1420 my $inner_pad = 5; # 5% of width for slider bg texture border
1421 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1422 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1423
1240 $page = int $page * $w / ($hi - $lo); 1424 $page = int $page * $inner_w / ($hi - $lo);
1241 $value = int +($value - $lo) * $w / ($hi - $lo); 1425 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1242 1426
1243 $w -= $page; 1427 $w -= $page;
1244 $page &= ~1; 1428 $page &= ~1;
1245 glTranslate $page * 0.5, 0, 0; 1429 glTranslate $page * 0.5, 0, 0;
1430 $page ||= 2;
1246 1431
1247 glColor @$fg;
1248 glBegin GL_LINES;
1249 glVertex 0, 0; glVertex 0, $h;
1250 glVertex $w - 1, 0; glVertex $w - 1, $h;
1251 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1252 glEnd;
1253
1254 my $knob_a = $value - $page * 0.5; 1432 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1255 my $knob_b = $value + $page * 0.5; 1433 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1256 1434
1257 glBegin GL_QUADS; 1435 glEnable GL_BLEND;
1258 glColor @$fg; 1436 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1259 glVertex $knob_a, 0; 1437 glEnable GL_TEXTURE_2D;
1260 glVertex $knob_a, $h; 1438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1261 glVertex $knob_b, $h;
1262 glVertex $knob_b, 0;
1263 1439
1264 if ($knob_a < $knob_b - 2) { 1440 # draw background
1265 glColor @$bg; 1441 $tex[1]->draw_quad (0, 0, $w, $h);
1266 glVertex $knob_a + 1, 1; 1442
1267 glVertex $knob_a + 1, $h - 1; 1443 # draw handle
1268 glVertex $knob_b - 1, $h - 1; 1444 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1269 glVertex $knob_b - 1, 1; 1445
1446 glDisable GL_BLEND;
1447 glDisable GL_TEXTURE_2D;
1448}
1449
1450#############################################################################
1451
1452package CFClient::UI::TextView;
1453
1454our @ISA = CFClient::UI::HBox::;
1455
1456use SDL::OpenGL;
1457
1458sub new {
1459 my $class = shift;
1460
1461 my $self = $class->SUPER::new (
1462 par => [],
1463 @_,
1464 children => [
1465 (new CFClient::UI::Empty expand => 1),
1466 (new CFClient::UI::Slider vertical => 1),
1467 ],
1468 );
1469
1470 $self
1471}
1472
1473sub add_paragraph {
1474 my ($self, $color, $text) = @_;
1475
1476 push @{$self->{par}}, [$color, $text];
1477 my $count = scalar @{$self->{par}};
1478 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1479 $self->{children}[1]->update;
1480}
1481
1482sub _draw {
1483 my ($self) = @_;
1484
1485 my $par = $self->{par};
1486
1487 my $bottom = (scalar @$par) - 1;
1488
1489 my $w = $self->{children}[0]{w};
1490 my $y = $self->{h};
1491
1492 glEnable GL_BLEND;
1493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1494 glEnable GL_TEXTURE_2D;
1495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1496
1497 # TODO: everything!
1498 while ($y > 0 && $bottom >= 0) {
1499 my $par = $par->[$bottom--];
1500
1501 my $layout = new CFClient::Layout;
1502
1503 $layout->set_height ($::FONTSIZE);
1504 $layout->set_width ($w);
1505 $layout->set_text ($par->[1]);
1506 my $tex = new_from_layout CFClient::Texture $layout;
1507 $y -= $tex->{h};
1508
1509 glColor @{ $par->[0] };
1510 $tex->draw_quad (0, $y);
1270 } 1511 }
1271 glEnd; 1512
1513 glDisable GL_TEXTURE_2D;
1514 glDisable GL_BLEND;
1272} 1515}
1273 1516
1274############################################################################# 1517#############################################################################
1275 1518
1276package CFClient::UI::MapWidget; 1519package CFClient::UI::MapWidget;
… …
1286 1529
1287sub new { 1530sub new {
1288 my $class = shift; 1531 my $class = shift;
1289 1532
1290 $class->SUPER::new ( 1533 $class->SUPER::new (
1291 z => -1, 1534 z => -1,
1535 can_focus => 1,
1292 list => (glGenLists 1), 1536 list => (glGenLists 1),
1293 @_ 1537 @_
1294 ) 1538 )
1295} 1539}
1296 1540
1297sub key_down { 1541sub key_down {
… …
1316} 1560}
1317 1561
1318sub draw { 1562sub draw {
1319 my ($self) = @_; 1563 my ($self) = @_;
1320 1564
1565 $self->{need_update}++;#d#
1321 if (delete $self->{need_update}) { 1566 if (delete $self->{need_update}) {
1322 glNewList $self->{list}, GL_COMPILE; 1567 glNewList $self->{list}, GL_COMPILE;
1323 1568
1324 my $mx = $::CONN->{mapx};
1325 my $my = $::CONN->{mapy};
1326
1327 my $map = $::CONN->{map};
1328
1329 my ($xofs, $yofs);
1330
1331 my $sw = 1 + int $::WIDTH / 32; 1569 my $sw = int $::WIDTH / 32;
1332 my $sh = 1 + int $::HEIGHT / 32; 1570 my $sh = int $::HEIGHT / 32;
1333 1571
1334 if ($::CONN->{mapw} > $sw) { 1572 if ($::MAP) {
1335 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1573 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1336 } else {
1337 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1338 }
1339 1574
1340 if ($::CONN->{maph} > $sh) { 1575 if ($::CFG->{fow_enable}) {
1341 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1576 if ($::CFG->{fow_smooth}) { # smooth fog of war
1342 } else { 1577 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1343 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1578 glConvolutionFilter2D
1344 } 1579 GL_CONVOLUTION_2D,
1345 1580 GL_ALPHA,
1346 glEnable GL_TEXTURE_2D; 1581 3, 3,
1347 glEnable GL_BLEND; 1582 GL_ALPHA, GL_FLOAT,
1348 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1583 pack "f*",
1349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1584 0.1, 0.1, 0.1,
1350 1585 0.1, 0.2, 0.1,
1351 my $sw4 = ($sw + 3) & ~3; 1586 0.1, 0.1, 0.1,
1352 my $darkness = "\x00" x ($sw4 * $sh);
1353
1354 for my $x (0 .. $sw - 1) {
1355 my $row = $map->[$x + $xofs];
1356 for my $y (0 .. $sh - 1) {
1357
1358 my $cell = $row->[$y + $yofs]
1359 or next; 1587 ;
1360 1588 glEnable GL_CONVOLUTION_2D;
1361 my $dark = $cell->[0];
1362 if ($dark < 0) {
1363 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1364 } else {
1365 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1366 } 1589 }
1367 1590
1368 for my $num (grep $_, @$cell[1,2,3]) { 1591 my $tex = new CFClient::Texture
1369 my $tex = $::CONN->{face}[$num]{texture} || next; 1592 w => $w,
1370 1593 h => $h,
1371 my ($w, $h) = @$tex{qw(w h)}; 1594 data => $data,
1595 internalformat => GL_ALPHA,
1596 format => GL_ALPHA;
1372 1597
1373 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1598 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1374 } 1599
1600 glEnable GL_BLEND;
1601 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1603
1604 glColor +($::CFG->{fow_intensity}) x 3, 1;
1605 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1606
1607 glDisable GL_TEXTURE_2D;
1608 glDisable GL_BLEND;
1375 } 1609 }
1376 } 1610 }
1377 1611
1378# if (1) { # higher quality darkness
1379# $lighting =~ s/(.)/$1$1$1/gs;
1380# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1381#
1382# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1383#
1384# $lighting = $pb->get_pixels;
1385# $lighting =~ s/(.)../$1/gs;
1386# }
1387
1388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1389
1390 $darkness = new CFClient::Texture
1391 w => $sw4,
1392 h => $sh,
1393 data => $darkness,
1394 internalformat => GL_ALPHA,
1395 format => GL_ALPHA;
1396
1397 glColor 0.45, 0.45, 0.45, 1;
1398 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1399
1400 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402
1403 glEndList; 1612 glEndList;
1404 } 1613 }
1405 1614
1406 glCallList $self->{list}; 1615 glCallList $self->{list};
1616
1617 if ($FOCUS != $self) {
1618 glColor 64/255, 64/255, 64/255;
1619 glLogicOp GL_AND;
1620 glEnable GL_COLOR_LOGIC_OP;
1621 glBegin GL_QUADS;
1622 glVertex 0, 0;
1623 glVertex 0, $::HEIGHT;
1624 glVertex $::WIDTH, $::HEIGHT;
1625 glVertex $::WIDTH, 0;
1626 glEnd;
1627 glDisable GL_COLOR_LOGIC_OP;
1628 }
1407} 1629}
1408 1630
1409my %DIR = ( 1631my %DIR = (
1410 SDLK_KP8, [1, "north"], 1632 SDLK_KP8, [1, "north"],
1411 SDLK_KP9, [2, "northeast"], 1633 SDLK_KP9, [2, "northeast"],
… …
1427 1649
1428 my $mod = $ev->key_mod; 1650 my $mod = $ev->key_mod;
1429 my $sym = $ev->key_sym; 1651 my $sym = $ev->key_sym;
1430 1652
1431 if ($sym == SDLK_KP5) { 1653 if ($sym == SDLK_KP5) {
1432 $::CONN->send ("command stay fire"); 1654 $::CONN->user_send ("command stay fire");
1655 } elsif ($sym == SDLK_a) {
1656 $::CONN->user_send ("command apply");
1657 } elsif ($sym == SDLK_QUOTE) {
1658 $self->emit ('activate_console');
1433 } elsif (exists $DIR{$sym}) { 1659 } elsif (exists $DIR{$sym}) {
1434 if ($mod & KMOD_SHIFT) { 1660 if ($mod & KMOD_SHIFT) {
1435 $self->{shft}++; 1661 $self->{shft}++;
1436 $::CONN->send ("command fire $DIR{$sym}[0]"); 1662 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1437 } elsif ($mod & KMOD_CTRL) { 1663 } elsif ($mod & KMOD_CTRL) {
1438 $self->{ctrl}++; 1664 $self->{ctrl}++;
1439 $::CONN->send ("command run $DIR{$sym}[0]"); 1665 $::CONN->user_send ("command run $DIR{$sym}[0]");
1440 } else { 1666 } else {
1441 $::CONN->send ("command $DIR{$sym}[1]"); 1667 $::CONN->user_send ("command $DIR{$sym}[1]");
1442 } 1668 }
1443 } 1669 }
1444} 1670}
1445 1671
1446sub key_up { 1672sub key_up {
… …
1448 1674
1449 my $mod = $ev->key_mod; 1675 my $mod = $ev->key_mod;
1450 my $sym = $ev->key_sym; 1676 my $sym = $ev->key_sym;
1451 1677
1452 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1678 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1453 $::CONN->send ("command fire_stop"); 1679 $::CONN->user_send ("command fire_stop");
1454 } 1680 }
1455 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1681 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1456 $::CONN->send ("command run_stop"); 1682 $::CONN->user_send ("command run_stop");
1457 } 1683 }
1458} 1684}
1459 1685
1460############################################################################# 1686#############################################################################
1461 1687
… …
1499 glPopMatrix; 1725 glPopMatrix;
1500} 1726}
1501 1727
1502############################################################################# 1728#############################################################################
1503 1729
1730package CFClient::UI::Flopper;
1731
1732our @ISA = CFClient::UI::Button::;
1733
1734sub new {
1735 my $class = shift;
1736
1737 my $self = $class->SUPER::new (
1738 state => 0,
1739 connect_activate => \&toggle_flopper,
1740 @_
1741 );
1742
1743 if ($self->{state}) {
1744 $self->{state} = 0;
1745 $self->toggle_flopper;
1746 }
1747
1748 $self
1749}
1750
1751sub toggle_flopper {
1752 my ($self) = @_;
1753
1754 # TODO: use animation
1755 if ($self->{state} = !$self->{state}) {
1756 $CFClient::UI::TOPLEVEL->add ($self->{other});
1757 $self->{other}->move (
1758 ($::WIDTH - $self->{other}{w}) * 0.5,
1759 ($::HEIGHT - $self->{other}{h}) * 0.5,
1760 );
1761 } else {
1762 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1763 }
1764}
1765
1766#############################################################################
1767
1504package CFClient::UI::Toplevel; 1768package CFClient::UI::Toplevel;
1505 1769
1506our @ISA = CFClient::UI::Container::; 1770our @ISA = CFClient::UI::Container::;
1507 1771
1508sub size_request { 1772sub size_request {

Diff Legend

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