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.98 by root, Fri Apr 14 02:06:22 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} };
654 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
655 645
656 glDisable GL_TEXTURE_2D; 646 glDisable GL_TEXTURE_2D;
657 glDisable GL_BLEND; 647 glDisable GL_BLEND;
658 648
659 $self->child->draw; 649 $self->child->draw;
660
661} 650}
662 651
663############################################################################# 652#############################################################################
664 653
665package CFClient::UI::Table; 654package CFClient::UI::Table;
… …
667our @ISA = CFClient::UI::Base::; 656our @ISA = CFClient::UI::Base::;
668 657
669use List::Util qw(max sum); 658use List::Util qw(max sum);
670 659
671use SDL::OpenGL; 660use SDL::OpenGL;
661
662sub new {
663 my $class = shift;
664
665 $class->SUPER::new (
666 col_expand => [],
667 @_
668 )
669}
672 670
673sub add { 671sub add {
674 my ($self, $x, $y, $chld) = @_; 672 my ($self, $x, $y, $chld) = @_;
675 673
676 $self->{children}[$y][$x] = $chld; 674 $self->{children}[$y][$x] = $chld;
… …
706 my ($self) = @_; 704 my ($self) = @_;
707 705
708 my ($ws, $hs) = $self->get_wh; 706 my ($ws, $hs) = $self->get_wh;
709 707
710 ( 708 (
711 (List::Util::sum @$ws), 709 (sum @$ws),
712 (List::Util::sum @$hs), 710 (sum @$hs),
713 ) 711 )
714} 712}
715 713
716sub size_allocate { 714sub size_allocate {
717 my ($self, $x, $y, $w, $h) = @_; 715 my ($self, $x, $y, $w, $h) = @_;
718 716
719 $self->_size_allocate ($x, $y, $w, $h) or return; 717 $self->_size_allocate ($x, $y, $w, $h) or return;
720 718
721 my ($ws, $hs) = $self->get_wh; 719 my ($ws, $hs) = $self->get_wh;
722 720
723 my $req_w = List::Util::sum @$ws; 721 my $req_w = sum @$ws;
724 my $req_h = List::Util::sum @$hs; 722 my $req_h = sum @$hs;
723
724 # TODO: nicer code && do row_expand
725 my @col_expand = @{$self->{col_expand}};
726 @col_expand = (1) x @$ws unless @col_expand;
727 my $col_expand = (sum @col_expand) || 1;
725 728
726 # linearly scale sizes 729 # linearly scale sizes
727 $_ *= $w / $req_w for @$ws; 730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $_ *= $h / $req_h for @$hs; 731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729 732
730 my $y; 733 my $y;
731 734
732 for my $r (0 .. $#{$self->{children}}) { 735 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 736 my $row = $self->{children}[$r]
… …
735 738
736 my $x = 0; 739 my $x = 0;
737 my $row_h = $hs->[$r]; 740 my $row_h = $hs->[$r];
738 741
739 for my $c (0 .. $#$row) { 742 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 743 my $col_w = $ws->[$c];
744 744
745 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 746 $widget->size_allocate ($x, $y, $col_w, $row_h);
747 }
746 748
747 $x += $col_w; 749 $x += $col_w;
748 } 750 }
749 751
750 $y += $row_h; 752 $y += $row_h;
… …
796} 798}
797 799
798sub size_allocate { 800sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 801 my ($self, $x, $y, $w, $h) = @_;
800 802
801 $self->_size_allocate ($x, $y, $w, $h) or return; 803 $self->_size_allocate ($x, $y, $w, $h);
802
803 return unless $self->{w};
804 804
805 ($h, $w) = ($w, $h); 805 ($h, $w) = ($w, $h);
806 806
807 my $children = $self->{children}; 807 my $children = $self->{children};
808 808
… …
810 810
811 my $req_h = List::Util::sum @h; 811 my $req_h = List::Util::sum @h;
812 812
813 if ($req_h > $h) { 813 if ($req_h > $h) {
814 # ah well, not enough space 814 # ah well, not enough space
815 $_ = $h[$_] * $h / $req_h for @h; 815 $_ *= $h / $req_h for @h;
816 } else { 816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children; 817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1; 818 $exp ||= 1;
819 819
820 for (0 .. $#$children) { 820 for (0 .. $#$children) {
… …
856} 856}
857 857
858sub size_allocate { 858sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
860 860
861 $self->_size_allocate ($x, $y, $w, $h) or return; 861 $self->_size_allocate ($x, $y, $w, $h);
862
863 return unless $self->{h};
864 862
865 my $children = $self->{children}; 863 my $children = $self->{children};
866 864
867 my @h = map +($_->size_request)[1], @$children; 865 my @h = map +($_->size_request)[1], @$children;
868 866
869 my $req_h = List::Util::sum @h; 867 my $req_h = List::Util::sum @h;
870 868
871 if ($req_h > $h) { 869 if ($req_h > $h) {
872 # ah well, not enough space 870 # ah well, not enough space
873 $_ = $h[$_] * $h / $req_h for @h; 871 $_ *= $h / $req_h for @h;
874 } else { 872 } else {
875 my $exp = List::Util::sum map $_->{expand}, @$children; 873 my $exp = List::Util::sum map $_->{expand}, @$children;
876 $exp ||= 1; 874 $exp ||= 1;
877 875
878 for (0 .. $#$children) { 876 for (0 .. $#$children) {
… …
933 931
934 $self->{text} = $text; 932 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 933 $self->{layout}->set_markup ($text);
936 934
937 delete $self->{texture}; 935 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
938 $self->update; 937 $self->update;
939} 938}
940 939
941sub get_text { 940sub get_text {
942 my ($self, $text) = @_; 941 my ($self, $text) = @_;
… …
975sub _draw { 974sub _draw {
976 my ($self) = @_; 975 my ($self) = @_;
977 976
978 my $tex = $self->{texture} ||= do { 977 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 978 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
980 new_from_layout CFClient::Texture $self->{layout} 980 new_from_layout CFClient::Texture $self->{layout}
981 }; 981 };
982 982
983 glEnable GL_BLEND; 983 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
990 my $x = 990 my $x =
991 $self->{align} < 0 ? $self->{padding} 991 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 993 : ($self->{w} - $tex->{w}) * 0.5;
994 994
995 $tex->draw_quad ($x, $self->{padding}); 995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
996 $tex->draw_quad (0, 0);
996 997
997 glDisable GL_TEXTURE_2D; 998 glDisable GL_TEXTURE_2D;
998 glDisable GL_BLEND; 999 glDisable GL_BLEND;
999} 1000}
1000 1001
… …
1011 my $class = shift; 1012 my $class = shift;
1012 1013
1013 $class->SUPER::new ( 1014 $class->SUPER::new (
1014 fg => [1, 1, 1], 1015 fg => [1, 1, 1],
1015 bg => [0, 0, 0, 0.2], 1016 bg => [0, 0, 0, 0.2],
1016 active_bg => [1, 1, 1], 1017 active_bg => [1, 1, 1, 0.5],
1017 active_fg => [0, 0, 0], 1018 active_fg => [0, 0, 0],
1019 can_hover => 1,
1020 can_focus => 1,
1018 @_ 1021 @_
1019 ) 1022 )
1020} 1023}
1021 1024
1022sub _set_text { 1025sub _set_text {
… …
1024 1027
1025 $self->{last_activity} = $::NOW; 1028 $self->{last_activity} = $::NOW;
1026 1029
1027 $self->{text} = $text; 1030 $self->{text} = $text;
1028 $self->{layout}->set_width ($self->{w}); 1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1029 1033
1030 $text =~ s/./*/g if $self->{hidden}; 1034 $text =~ s/./*/g if $self->{hidden};
1031 1035
1032 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1036 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1033 1037
… …
1154 } 1158 }
1155} 1159}
1156 1160
1157############################################################################# 1161#############################################################################
1158 1162
1159package CFClient::UI::Slider; 1163package CFClient::UI::Button;
1160 1164
1161use strict; 1165our @ISA = CFClient::UI::Label::;
1162 1166
1167use SDL;
1163use SDL::OpenGL; 1168use SDL::OpenGL;
1164 1169
1165our @ISA = CFClient::UI::DrawBG::; 1170my @tex =
1171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1172 qw(b1_button_active.png);
1166 1173
1167sub new { 1174sub new {
1168 my $class = shift; 1175 my $class = shift;
1169 1176
1177 $class->SUPER::new (
1178 padding => 4,
1179 fg => [1, 1, 1],
1180 bg => [1, 1, 1, 0.2],
1181 active_fg => [1, 1, 0],
1182 can_hover => 1,
1183 @_
1184 )
1185}
1186
1187sub button_up {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($x >= 0 && $x < $self->{w}
1191 && $y >= 0 && $y < $self->{h}) {
1192 $self->emit ("activate");
1193 }
1194}
1195
1196sub _draw {
1197 my ($self) = @_;
1198
1199 local $self->{fg} = $self->{fg};
1200 my $tex = $tex[0];
1201
1202 glEnable GL_BLEND;
1203 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205
1206 if ($GRAB == $self) {
1207 $self->{fg} = $self->{active_fg};
1208 }
1209
1210 glBindTexture GL_TEXTURE_2D, $tex->{name};
1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1212
1213 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1214
1215 glDisable GL_TEXTURE_2D;
1216 glDisable GL_BLEND;
1217
1218 $self->SUPER::_draw;
1219}
1220
1221#############################################################################
1222
1223package CFClient::UI::CheckBox;
1224
1225our @ISA = CFClient::UI::DrawBG::;
1226
1227use SDL;
1228use SDL::OpenGL;
1229
1230sub new {
1231 my $class = shift;
1232
1233 $class->SUPER::new (
1234 padding => 2,
1235 fg => [1, 1, 1],
1236 active_fg => [1, 1, 0],
1237 state => 0,
1238 can_hover => 1,
1239 @_
1240 )
1241}
1242
1243sub size_request {
1244 my ($self) = @_;
1245
1246 ($self->{padding} * 2 + 6) x 2
1247}
1248
1249sub size_allocate {
1250 my ($self, $x, $y, $w, $h) = @_;
1251
1252 $self->_size_allocate ($x, $y, $w, $h);
1253}
1254
1255sub button_down {
1256 my ($self, $ev, $x, $y) = @_;
1257
1258 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1259 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1260 $self->{state} = !$self->{state};
1261 $self->emit (changed => $self->{state});
1262 }
1263}
1264
1265sub _draw {
1266 my ($self) = @_;
1267
1268 $self->SUPER::_draw;
1269
1270 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271
1272 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1273
1274 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1275
1276 glBegin GL_LINE_LOOP;
1277 glVertex 0 , 0;
1278 glVertex 0 , $s;
1279 glVertex $s, $s;
1280 glVertex $s, 0;
1281 glEnd;
1282
1283 if ($self->{state}) {
1284 glBegin GL_LINES;
1285 glVertex 0 , 0;
1286 glVertex $s, $s;
1287 glVertex $s, 0;
1288 glVertex 0 , $s;
1289 glEnd;
1290 }
1291}
1292
1293#############################################################################
1294
1295package CFClient::UI::Slider;
1296
1297use strict;
1298
1299use SDL::OpenGL;
1300
1301our @ISA = CFClient::UI::DrawBG::;
1302
1303sub new {
1304 my $class = shift;
1305
1170 # range [value, low, high, page] 1306 # range [value, low, high, page]
1171 1307
1308 # TODO: 0-width page
1309 # TODO: req_w/h are wrong with vertical
1310 # TODO: calculations are off
1172 my $self = $class->SUPER::new ( 1311 my $self = $class->SUPER::new (
1173 fg => [1, 1, 1], 1312 fg => [1, 1, 1],
1174 active_fg => [0, 0, 0], 1313 active_fg => [0, 0, 0],
1175 range => [0, 0, 100, 10], 1314 range => [0, 0, 100, 10],
1176 req_w => 40, 1315 req_w => 40,
1177 req_h => 10, 1316 req_h => 13,
1178 vertical => 0, 1317 vertical => 0,
1318 can_hover => 1,
1179 @_ 1319 @_
1180 ); 1320 );
1181 1321
1182 $self 1322 $self
1183} 1323}
… …
1241 $value = int +($value - $lo) * $w / ($hi - $lo); 1381 $value = int +($value - $lo) * $w / ($hi - $lo);
1242 1382
1243 $w -= $page; 1383 $w -= $page;
1244 $page &= ~1; 1384 $page &= ~1;
1245 glTranslate $page * 0.5, 0, 0; 1385 glTranslate $page * 0.5, 0, 0;
1386 $page ||= 2;
1246 1387
1247 glColor @$fg; 1388 glColor @$fg;
1248 glBegin GL_LINES; 1389 glBegin GL_LINES;
1249 glVertex 0, 0; glVertex 0, $h; 1390 glVertex 0, 0; glVertex 0, $h;
1250 glVertex $w - 1, 0; glVertex $w - 1, $h; 1391 glVertex $w - 1, 0; glVertex $w - 1, $h;
… …
1271 glEnd; 1412 glEnd;
1272} 1413}
1273 1414
1274############################################################################# 1415#############################################################################
1275 1416
1417package CFClient::UI::TextView;
1418
1419our @ISA = CFClient::UI::HBox::;
1420
1421use SDL::OpenGL;
1422
1423sub new {
1424 my $class = shift;
1425
1426 my $self = $class->SUPER::new (
1427 par => [],
1428 @_,
1429 children => [
1430 (new CFClient::UI::Empty expand => 1),
1431 (new CFClient::UI::Slider vertical => 1),
1432 ],
1433 );
1434
1435 $self
1436}
1437
1438sub add_paragraph {
1439 my ($self, $color, $text) = @_;
1440
1441 push @{$self->{par}}, [$color, $text];
1442 my $count = scalar @{$self->{par}};
1443 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1444 $self->{children}[1]->update;
1445}
1446
1447sub _draw {
1448 my ($self) = @_;
1449
1450 my $par = $self->{par};
1451
1452 my $bottom = (scalar @$par) - 1;
1453
1454 my $w = $self->{children}[0]{w};
1455 my $y = $self->{h};
1456
1457 glEnable GL_BLEND;
1458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459 glEnable GL_TEXTURE_2D;
1460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1461
1462 # TODO: everything!
1463 while ($y > 0 && $bottom >= 0) {
1464 my $par = $par->[$bottom--];
1465
1466 my $layout = new CFClient::Layout;
1467
1468 $layout->set_height ($::FONTSIZE);
1469 $layout->set_width ($w);
1470 $layout->set_text ($par->[1]);
1471 my $tex = new_from_layout CFClient::Texture $layout;
1472 $y -= $tex->{h};
1473
1474 glColor @{ $par->[0] };
1475 $tex->draw_quad (0, $y);
1476 }
1477
1478 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480}
1481
1482#############################################################################
1483
1276package CFClient::UI::MapWidget; 1484package CFClient::UI::MapWidget;
1277 1485
1278use strict; 1486use strict;
1279 1487
1280use List::Util qw(min max); 1488use List::Util qw(min max);
… …
1286 1494
1287sub new { 1495sub new {
1288 my $class = shift; 1496 my $class = shift;
1289 1497
1290 $class->SUPER::new ( 1498 $class->SUPER::new (
1291 z => -1, 1499 z => -1,
1500 can_focus => 1,
1292 list => (glGenLists 1), 1501 list => (glGenLists 1),
1293 @_ 1502 @_
1294 ) 1503 )
1295} 1504}
1296 1505
1297sub key_down { 1506sub key_down {
… …
1316} 1525}
1317 1526
1318sub draw { 1527sub draw {
1319 my ($self) = @_; 1528 my ($self) = @_;
1320 1529
1530 $self->{need_update}++;#d#
1321 if (delete $self->{need_update}) { 1531 if (delete $self->{need_update}) {
1322 glNewList $self->{list}, GL_COMPILE; 1532 glNewList $self->{list}, GL_COMPILE;
1323 1533
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; 1534 my $sw = int $::WIDTH / 32;
1332 my $sh = 1 + int $::HEIGHT / 32; 1535 my $sh = int $::HEIGHT / 32;
1333 1536
1334 if ($::CONN->{mapw} > $sw) { 1537 if ($::MAP) {
1335 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1538 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 1539
1340 if ($::CONN->{maph} > $sh) { 1540 if ($::CFG->{fow_enable}) {
1341 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1541 if ($::CFG->{fow_smooth}) { # smooth fog of war
1342 } else { 1542 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}; 1543 glConvolutionFilter2D
1344 } 1544 GL_CONVOLUTION_2D,
1345 1545 GL_ALPHA,
1346 glEnable GL_TEXTURE_2D; 1546 3, 3,
1347 glEnable GL_BLEND; 1547 GL_ALPHA, GL_FLOAT,
1348 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1548 pack "f*",
1349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1549 0.1, 0.1, 0.1,
1350 1550 0.1, 0.2, 0.1,
1351 my $sw4 = ($sw + 3) & ~3; 1551 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; 1552 ;
1360 1553 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 } 1554 }
1367 1555
1368 for my $num (grep $_, @$cell[1,2,3]) { 1556 my $tex = new CFClient::Texture
1369 my $tex = $::CONN->{face}[$num]{texture} || next; 1557 w => $w,
1370 1558 h => $h,
1371 my ($w, $h) = @$tex{qw(w h)}; 1559 data => $data,
1560 internalformat => GL_ALPHA,
1561 format => GL_ALPHA;
1372 1562
1373 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1563 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1374 } 1564
1565 glEnable GL_BLEND;
1566 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1568
1569 glColor +($::CFG->{fow_intensity}) x 3, 1;
1570 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1571
1572 glDisable GL_TEXTURE_2D;
1573 glDisable GL_BLEND;
1375 } 1574 }
1376 } 1575 }
1377 1576
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; 1577 glEndList;
1404 } 1578 }
1405 1579
1406 glCallList $self->{list}; 1580 glCallList $self->{list};
1581
1582 if ($FOCUS != $self) {
1583 glColor 64/255, 64/255, 64/255;
1584 glLogicOp GL_AND;
1585 glEnable GL_COLOR_LOGIC_OP;
1586 glBegin GL_QUADS;
1587 glVertex 0, 0;
1588 glVertex 0, $::HEIGHT;
1589 glVertex $::WIDTH, $::HEIGHT;
1590 glVertex $::WIDTH, 0;
1591 glEnd;
1592 glDisable GL_COLOR_LOGIC_OP;
1593 }
1407} 1594}
1408 1595
1409my %DIR = ( 1596my %DIR = (
1410 SDLK_KP8, [1, "north"], 1597 SDLK_KP8, [1, "north"],
1411 SDLK_KP9, [2, "northeast"], 1598 SDLK_KP9, [2, "northeast"],
… …
1427 1614
1428 my $mod = $ev->key_mod; 1615 my $mod = $ev->key_mod;
1429 my $sym = $ev->key_sym; 1616 my $sym = $ev->key_sym;
1430 1617
1431 if ($sym == SDLK_KP5) { 1618 if ($sym == SDLK_KP5) {
1432 $::CONN->send ("command stay fire"); 1619 $::CONN->user_send ("command stay fire");
1620 } elsif ($sym == SDLK_a) {
1621 $::CONN->user_send ("command apply");
1433 } elsif (exists $DIR{$sym}) { 1622 } elsif (exists $DIR{$sym}) {
1434 if ($mod & KMOD_SHIFT) { 1623 if ($mod & KMOD_SHIFT) {
1435 $self->{shft}++; 1624 $self->{shft}++;
1436 $::CONN->send ("command fire $DIR{$sym}[0]"); 1625 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1437 } elsif ($mod & KMOD_CTRL) { 1626 } elsif ($mod & KMOD_CTRL) {
1438 $self->{ctrl}++; 1627 $self->{ctrl}++;
1439 $::CONN->send ("command run $DIR{$sym}[0]"); 1628 $::CONN->user_send ("command run $DIR{$sym}[0]");
1440 } else { 1629 } else {
1441 $::CONN->send ("command $DIR{$sym}[1]"); 1630 $::CONN->user_send ("command $DIR{$sym}[1]");
1442 } 1631 }
1443 } 1632 }
1444} 1633}
1445 1634
1446sub key_up { 1635sub key_up {
… …
1448 1637
1449 my $mod = $ev->key_mod; 1638 my $mod = $ev->key_mod;
1450 my $sym = $ev->key_sym; 1639 my $sym = $ev->key_sym;
1451 1640
1452 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1641 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1453 $::CONN->send ("command fire_stop"); 1642 $::CONN->user_send ("command fire_stop");
1454 } 1643 }
1455 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1644 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1456 $::CONN->send ("command run_stop"); 1645 $::CONN->user_send ("command run_stop");
1457 } 1646 }
1458} 1647}
1459 1648
1460############################################################################# 1649#############################################################################
1461 1650
… …
1499 glPopMatrix; 1688 glPopMatrix;
1500} 1689}
1501 1690
1502############################################################################# 1691#############################################################################
1503 1692
1693package CFClient::UI::Flopper;
1694
1695our @ISA = CFClient::UI::Button::;
1696
1697sub new {
1698 my $class = shift;
1699
1700 my $self = $class->SUPER::new (
1701 state => 0,
1702 connect_activate => \&toggle_flopper,
1703 @_
1704 );
1705
1706 if ($self->{state}) {
1707 $self->{state} = 0;
1708 $self->toggle_flopper;
1709 }
1710
1711 $self
1712}
1713
1714sub toggle_flopper {
1715 my ($self) = @_;
1716
1717 # TODO: use animation
1718 if ($self->{state} = !$self->{state}) {
1719 $CFClient::UI::TOPLEVEL->add ($self->{other});
1720 $self->{other}->move (
1721 ($::WIDTH - $self->{other}{w}) * 0.5,
1722 ($::HEIGHT - $self->{other}{h}) * 0.5,
1723 );
1724 } else {
1725 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1726 }
1727}
1728
1729#############################################################################
1730
1504package CFClient::UI::Toplevel; 1731package CFClient::UI::Toplevel;
1505 1732
1506our @ISA = CFClient::UI::Container::; 1733our @ISA = CFClient::UI::Container::;
1507 1734
1508sub size_request { 1735sub size_request {

Diff Legend

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