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.76 by root, Tue Apr 11 21:24:09 2006 UTC vs.
Revision 1.101 by elmex, Fri Apr 14 11:43:51 2006 UTC

… …
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47 47
48 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
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 {
… …
330 326
331 $self 327 $self
332} 328}
333 329
334sub add { 330sub add {
335 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
336 332
337 $chld->{expand} = $expand;
338 $chld->set_parent ($self); 333 $chld->set_parent ($self);
339 334
340 $self->{children} = [ 335 $self->{children} = [
341 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
342 @{$self->{children}}, $chld 337 @{$self->{children}}, $chld
… …
535 530
536my @tex = 531my @tex =
537 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
538 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);
539 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
540sub size_request { 548sub size_request {
541 my ($self) = @_; 549 my ($self) = @_;
542 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
543 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
544 554
545 $h += $tex[1]->{h}; 555 (
546 $h += $tex[4]->{h}; 556 $w + $self->{border} * 2,
547 $w += $tex[2]->{w}; 557 $h + $self->{border} * 2,
548 $w += $tex[3]->{w}; 558 )
549
550 ($w, $h)
551} 559}
552 560
553sub size_allocate { 561sub size_allocate {
554 my ($self, $x, $y, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
555 563
556 $self->_size_allocate ($x, $y, $w, $h) or return; 564 $self->_size_allocate ($x, $y, $w, $h) or return;
557 565
558 $h -= $tex[1]->{h}; 566 $h -= List::Util::max 0, $self->{border} * 2;
559 $h -= $tex[4]->{h}; 567 $w -= List::Util::max 0, $self->{border} * 2;
560 $w -= $tex[2]->{w};
561 $w -= $tex[3]->{w};
562 568
563 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
564 $w = $w < 0 ? 0 : $w; 570}
565 571
566 my $child = $self->child; 572sub button_down {
573 my ($self, $ev, $x, $y) = @_;
567 574
568 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
569} 618}
570 619
571sub _draw { 620sub _draw {
572 my ($self) = @_; 621 my ($self) = @_;
573 622
574 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
575 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
576 625
577 glEnable GL_BLEND; 626 glEnable GL_BLEND;
578 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
579 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
581 630
582 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
583 $top->draw_quad (0, 0, $w, $top->{h}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
584 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
585 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
586 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
587
588 my $right = $tex[2];
589 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
590
591 my $bottom = $tex[4];
592 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
593 636
594 my $bg = $tex[0]; 637 my $bg = $tex[0];
595 638
596 glBindTexture GL_TEXTURE_2D, $bg->{name}; 639 # TODO: repeat texture not scale
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
598 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
599 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
600
601 my $rep_x = $cw / $bg->{w}; 640 my $rep_x = $cw / $bg->{w};
602 my $rep_y = $ch / $bg->{h}; 641 my $rep_y = $ch / $bg->{h};
603 642
643 glColor @{ $self->{bg} };
644
645 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1;
604 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
605 649
606 glDisable GL_TEXTURE_2D; 650 glDisable GL_TEXTURE_2D;
607 glDisable GL_BLEND; 651 glDisable GL_BLEND;
608 652
609 $self->child->draw; 653 $self->child->draw;
610
611} 654}
612 655
613############################################################################# 656#############################################################################
614 657
615package CFClient::UI::Table; 658package CFClient::UI::Table;
… …
617our @ISA = CFClient::UI::Base::; 660our @ISA = CFClient::UI::Base::;
618 661
619use List::Util qw(max sum); 662use List::Util qw(max sum);
620 663
621use SDL::OpenGL; 664use SDL::OpenGL;
665
666sub new {
667 my $class = shift;
668
669 $class->SUPER::new (
670 col_expand => [],
671 @_
672 )
673}
622 674
623sub add { 675sub add {
624 my ($self, $x, $y, $chld) = @_; 676 my ($self, $x, $y, $chld) = @_;
625 677
626 $self->{children}[$y][$x] = $chld; 678 $self->{children}[$y][$x] = $chld;
… …
656 my ($self) = @_; 708 my ($self) = @_;
657 709
658 my ($ws, $hs) = $self->get_wh; 710 my ($ws, $hs) = $self->get_wh;
659 711
660 ( 712 (
661 (List::Util::sum @$ws), 713 (sum @$ws),
662 (List::Util::sum @$hs), 714 (sum @$hs),
663 ) 715 )
664} 716}
665 717
666sub size_allocate { 718sub size_allocate {
667 my ($self, $x, $y, $w, $h) = @_; 719 my ($self, $x, $y, $w, $h) = @_;
668 720
669 $self->_size_allocate ($x, $y, $w, $h) or return; 721 $self->_size_allocate ($x, $y, $w, $h) or return;
670 722
671 my ($ws, $hs) = $self->get_wh; 723 my ($ws, $hs) = $self->get_wh;
672 724
673 my $req_w = List::Util::sum @$ws; 725 my $req_w = sum @$ws;
674 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;
675 732
676 # linearly scale sizes 733 # linearly scale sizes
677 $_ *= $req_w / $w for @$ws; 734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
678 $_ *= $req_h / $h for @$hs; 735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
679 736
680 my $y; 737 my $y;
681 738
682 for my $r (0 .. $#{$self->{children}}) { 739 for my $r (0 .. $#{$self->{children}}) {
683 my $row = $self->{children}[$r] 740 my $row = $self->{children}[$r]
… …
685 742
686 my $x = 0; 743 my $x = 0;
687 my $row_h = $hs->[$r]; 744 my $row_h = $hs->[$r];
688 745
689 for my $c (0 .. $#$row) { 746 for my $c (0 .. $#$row) {
690 my $widget = $row->[$c]
691 or next;
692
693 my $col_w = $ws->[$c]; 747 my $col_w = $ws->[$c];
694 748
749 if (my $widget = $row->[$c]) {
695 $widget->size_allocate ($x, $y, $col_w, $row_h); 750 $widget->size_allocate ($x, $y, $col_w, $row_h);
751 }
696 752
697 $x += $col_w; 753 $x += $col_w;
698 } 754 }
699 755
700 $y += $row_h; 756 $y += $row_h;
… …
746} 802}
747 803
748sub size_allocate { 804sub size_allocate {
749 my ($self, $x, $y, $w, $h) = @_; 805 my ($self, $x, $y, $w, $h) = @_;
750 806
751 $self->_size_allocate ($x, $y, $w, $h) or return; 807 $self->_size_allocate ($x, $y, $w, $h);
752
753 return unless $self->{w};
754 808
755 ($h, $w) = ($w, $h); 809 ($h, $w) = ($w, $h);
756 810
757 my $children = $self->{children}; 811 my $children = $self->{children};
758 812
… …
760 814
761 my $req_h = List::Util::sum @h; 815 my $req_h = List::Util::sum @h;
762 816
763 if ($req_h > $h) { 817 if ($req_h > $h) {
764 # ah well, not enough space 818 # ah well, not enough space
765 $_ = $h[$_] * $h / $req_h for @h; 819 $_ *= $h / $req_h for @h;
766 } else { 820 } else {
767 my @exp = grep $_->{expand}, @$children; 821 my $exp = List::Util::sum map $_->{expand}, @$children;
768 @exp = @$children unless @exp; 822 $exp ||= 1;
769 823
770 my %exp = map +($_ => 1), @exp;
771
772 for (0 .. $#$children) { 824 for (0 .. $#$children) {
773 my $child = $children->[$_]; 825 my $child = $children->[$_];
774 826
775 my $alloc_h = $h[$_]; 827 my $alloc_h = $h[$_];
776 $alloc_h += ($h - $req_h) / @exp if $exp{$child}; 828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
777 $h[$_] = $alloc_h; 829 $h[$_] = $alloc_h;
778 } 830 }
779 } 831 }
780 832
781 my $y = 0; 833 my $y = 0;
… …
808} 860}
809 861
810sub size_allocate { 862sub size_allocate {
811 my ($self, $x, $y, $w, $h) = @_; 863 my ($self, $x, $y, $w, $h) = @_;
812 864
813 $self->_size_allocate ($x, $y, $w, $h) or return; 865 $self->_size_allocate ($x, $y, $w, $h);
814
815 return unless $self->{h};
816 866
817 my $children = $self->{children}; 867 my $children = $self->{children};
818 868
819 my @h = map +($_->size_request)[1], @$children; 869 my @h = map +($_->size_request)[1], @$children;
820 870
821 my $req_h = List::Util::sum @h; 871 my $req_h = List::Util::sum @h;
822 872
823 if ($req_h > $h) { 873 if ($req_h > $h) {
824 # ah well, not enough space 874 # ah well, not enough space
825 $_ = $h[$_] * $h / $req_h for @h; 875 $_ *= $h / $req_h for @h;
826 } else { 876 } else {
827 my @exp = grep $_->{expand}, @$children; 877 my $exp = List::Util::sum map $_->{expand}, @$children;
828 @exp = @$children unless @exp; 878 $exp ||= 1;
829 879
830 my %exp = map +($_ => 1), @exp;
831
832 for (0 .. $#$children) { 880 for (0 .. $#$children) {
833 my $child = $children->[$_]; 881 my $child = $children->[$_];
834 882
835 my $alloc_h = $h[$_]; 883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
836 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
837 $h[$_] = $alloc_h;
838 } 884 }
839 } 885 }
840 886
841 my $y = 0; 887 my $y = 0;
842 for (0 .. $#$children) { 888 for (0 .. $#$children) {
… …
889 935
890 $self->{text} = $text; 936 $self->{text} = $text;
891 $self->{layout}->set_markup ($text); 937 $self->{layout}->set_markup ($text);
892 938
893 delete $self->{texture}; 939 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
894 $self->update; 941 $self->update;
895} 942}
896 943
897sub get_text { 944sub get_text {
898 my ($self, $text) = @_; 945 my ($self, $text) = @_;
… …
931sub _draw { 978sub _draw {
932 my ($self) = @_; 979 my ($self) = @_;
933 980
934 my $tex = $self->{texture} ||= do { 981 my $tex = $self->{texture} ||= do {
935 $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});
936 new_from_layout CFClient::Texture $self->{layout} 984 new_from_layout CFClient::Texture $self->{layout}
937 }; 985 };
938 986
939 glEnable GL_BLEND; 987 glEnable GL_BLEND;
940 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
946 my $x = 994 my $x =
947 $self->{align} < 0 ? $self->{padding} 995 $self->{align} < 0 ? $self->{padding}
948 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949 : ($self->{w} - $tex->{w}) * 0.5; 997 : ($self->{w} - $tex->{w}) * 0.5;
950 998
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
951 $tex->draw_quad ($x, 0); 1000 $tex->draw_quad (0, 0);
952 1001
953 glDisable GL_TEXTURE_2D; 1002 glDisable GL_TEXTURE_2D;
954 glDisable GL_BLEND; 1003 glDisable GL_BLEND;
955} 1004}
956 1005
… …
967 my $class = shift; 1016 my $class = shift;
968 1017
969 $class->SUPER::new ( 1018 $class->SUPER::new (
970 fg => [1, 1, 1], 1019 fg => [1, 1, 1],
971 bg => [0, 0, 0, 0.2], 1020 bg => [0, 0, 0, 0.2],
972 active_bg => [1, 1, 1], 1021 active_bg => [1, 1, 1, 0.5],
973 active_fg => [0, 0, 0], 1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
974 @_ 1025 @_
975 ) 1026 )
976} 1027}
977 1028
978sub _set_text { 1029sub _set_text {
979 my ($self, $text) = @_; 1030 my ($self, $text) = @_;
980 1031
1032 my $old_text = $self->{text};
1033
981 $self->{last_activity} = $::NOW; 1034 $self->{last_activity} = $::NOW;
982 1035
983 $self->{text} = $text; 1036 $self->{text} = $text;
984 $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});
985 1039
986 $text =~ s/./*/g if $self->{hidden}; 1040 $text =~ s/./*/g if $self->{hidden};
987 1041
988 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
989 1043
990 $text = substr $text, 0, $self->{cursor}; 1044 $text = substr $text, 0, $self->{cursor};
991 utf8::encode $text; 1045 utf8::encode $text;
992 1046
993 @$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};
994} 1051}
995 1052
996sub size_request { 1053sub size_request {
997 my ($self) = @_; 1054 my ($self) = @_;
998 1055
… …
1037 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1038 } elsif ($sym == SDLK_HOME) { 1095 } elsif ($sym == SDLK_HOME) {
1039 $self->{cursor} = 0; 1096 $self->{cursor} = 0;
1040 } elsif ($sym == SDLK_END) { 1097 } elsif ($sym == SDLK_END) {
1041 $self->{cursor} = length $text; 1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1042 } elsif ($uni) { 1101 } elsif ($uni) {
1043 substr $text, $self->{cursor}++, 0, chr $uni; 1102 substr $text, $self->{cursor}++, 0, chr $uni;
1044 } 1103 }
1045 1104
1046 $self->_set_text ($text); 1105 $self->_set_text ($text);
… …
1108 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1109 glEnd; 1168 glEnd;
1110 } 1169 }
1111} 1170}
1112 1171
1113#############################################################################
1114
1115package CFClient::UI::Slider; 1172package CFClient::UI::LineEntry;
1116 1173
1117use strict; 1174our @ISA = CFClient::UI::Entry::;
1118 1175
1176use SDL;
1119use SDL::OpenGL; 1177use SDL::OpenGL;
1120 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
1121our @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);
1122 1206
1123sub new { 1207sub new {
1124 my $class = shift; 1208 my $class = shift;
1125 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
1126 # range [value, low, high, page] 1343 # range [value, low, high, page]
1127 1344
1345 # TODO: 0-width page
1346 # TODO: req_w/h are wrong with vertical
1347 # TODO: calculations are off
1128 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1129 fg => [1, 1, 1], 1349 fg => [1, 1, 1],
1130 active_fg => [0, 0, 0], 1350 active_fg => [0, 0, 0],
1131 range => [0, 0, 100, 10], 1351 range => [0, 0, 100, 10],
1132 req_w => 40, 1352 req_w => 40,
1133 req_h => 10, 1353 req_h => 13,
1134 vertical => 0, 1354 vertical => 0,
1355 can_hover => 1,
1135 @_ 1356 @_
1136 ); 1357 );
1137 1358
1138 $self 1359 $self
1139} 1360}
… …
1191 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1412 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1192 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1413 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1193 1414
1194 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1415 my ($value, $lo, $hi, $page) = @{$self->{range}};
1195 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
1196 $page = int $page * $w / ($hi - $lo); 1424 $page = int $page * $inner_w / ($hi - $lo);
1197 $value = int +($value - $lo) * $w / ($hi - $lo); 1425 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1198 1426
1199 $w -= $page; 1427 $w -= $page;
1200 $page &= ~1; 1428 $page &= ~1;
1201 glTranslate $page * 0.5, 0, 0; 1429 glTranslate $page * 0.5, 0, 0;
1430 $page ||= 2;
1202 1431
1203 glColor @$fg;
1204 glBegin GL_LINES;
1205 glVertex 0, 0; glVertex 0, $h;
1206 glVertex $w - 1, 0; glVertex $w - 1, $h;
1207 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1208 glEnd;
1209
1210 my $knob_a = $value - $page * 0.5; 1432 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1211 my $knob_b = $value + $page * 0.5; 1433 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1212 1434
1213 glBegin GL_QUADS; 1435 glEnable GL_BLEND;
1214 glColor @$fg; 1436 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215 glVertex $knob_a, 0; 1437 glEnable GL_TEXTURE_2D;
1216 glVertex $knob_a, $h; 1438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1217 glVertex $knob_b, $h;
1218 glVertex $knob_b, 0;
1219 1439
1220 if ($knob_a < $knob_b - 2) { 1440 # draw background
1221 glColor @$bg; 1441 $tex[1]->draw_quad (0, 0, $w, $h);
1222 glVertex $knob_a + 1, 1; 1442
1223 glVertex $knob_a + 1, $h - 1; 1443 # draw handle
1224 glVertex $knob_b - 1, $h - 1; 1444 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1225 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);
1226 } 1511 }
1227 glEnd; 1512
1513 glDisable GL_TEXTURE_2D;
1514 glDisable GL_BLEND;
1228} 1515}
1229 1516
1230############################################################################# 1517#############################################################################
1231 1518
1232package CFClient::UI::MapWidget; 1519package CFClient::UI::MapWidget;
… …
1242 1529
1243sub new { 1530sub new {
1244 my $class = shift; 1531 my $class = shift;
1245 1532
1246 $class->SUPER::new ( 1533 $class->SUPER::new (
1247 z => -1, 1534 z => -1,
1535 can_focus => 1,
1248 list => (glGenLists 1), 1536 list => (glGenLists 1),
1249 @_ 1537 @_
1250 ) 1538 )
1251} 1539}
1252 1540
1253sub key_down { 1541sub key_down {
… …
1257sub key_up { 1545sub key_up {
1258} 1546}
1259 1547
1260sub size_request { 1548sub size_request {
1261 ( 1549 (
1262 1 + int $::WIDTH / 32, 1550 1 + 32 * int $::WIDTH / 32,
1263 1 + int $::HEIGHT / 32, 1551 1 + 32 * int $::HEIGHT / 32,
1264 ) 1552 )
1265} 1553}
1266 1554
1267sub update { 1555sub update {
1268 my ($self) = @_; 1556 my ($self) = @_;
1269 1557
1270 $self->{need_update} = 1; 1558 $self->{need_update} = 1;
1271 $self->SUPER::update; 1559 $self->SUPER::update;
1272} 1560}
1273 1561
1274sub _draw { 1562sub draw {
1275 my ($self) = @_; 1563 my ($self) = @_;
1276 1564
1565 $self->{need_update}++;#d#
1277 if (delete $self->{need_update}) { 1566 if (delete $self->{need_update}) {
1278 glNewList $self->{list}, GL_COMPILE; 1567 glNewList $self->{list}, GL_COMPILE;
1279 1568
1280 my $mx = $::CONN->{mapx};
1281 my $my = $::CONN->{mapy};
1282
1283 my $map = $::CONN->{map};
1284
1285 my ($xofs, $yofs);
1286
1287 my $sw = 1 + int $::WIDTH / 32; 1569 my $sw = int $::WIDTH / 32;
1288 my $sh = 1 + int $::HEIGHT / 32; 1570 my $sh = int $::HEIGHT / 32;
1289 1571
1290 if ($::CONN->{mapw} > $sw) { 1572 if ($::MAP) {
1291 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1573 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1292 } else {
1293 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1294 }
1295 1574
1296 if ($::CONN->{maph} > $sh) { 1575 if ($::CFG->{fow_enable}) {
1297 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1576 if ($::CFG->{fow_smooth}) { # smooth fog of war
1298 } else { 1577 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1299 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1578 glConvolutionFilter2D
1300 } 1579 GL_CONVOLUTION_2D,
1301 1580 GL_ALPHA,
1302 glEnable GL_TEXTURE_2D; 1581 3, 3,
1303 glEnable GL_BLEND; 1582 GL_ALPHA, GL_FLOAT,
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1583 pack "f*",
1305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1584 0.1, 0.1, 0.1,
1306 1585 0.1, 0.2, 0.1,
1307 my $sw4 = ($sw + 3) & ~3; 1586 0.1, 0.1, 0.1,
1308 my $darkness = "\x00" x ($sw4 * $sh);
1309
1310 for my $x (0 .. $sw - 1) {
1311 my $row = $map->[$x + $xofs];
1312 for my $y (0 .. $sh - 1) {
1313
1314 my $cell = $row->[$y + $yofs]
1315 or next; 1587 ;
1316 1588 glEnable GL_CONVOLUTION_2D;
1317 my $dark = $cell->[0];
1318 if ($dark < 0) {
1319 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1320 } else {
1321 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1322 } 1589 }
1323 1590
1324 for my $num (grep $_, @$cell[1,2,3]) { 1591 my $tex = new CFClient::Texture
1325 my $tex = $::CONN->{face}[$num]{texture} || next; 1592 w => $w,
1326 1593 h => $h,
1327 my ($w, $h) = @$tex{qw(w h)}; 1594 data => $data,
1595 internalformat => GL_ALPHA,
1596 format => GL_ALPHA;
1328 1597
1329 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1598 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1330 } 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;
1331 } 1609 }
1332 } 1610 }
1333 1611
1334# if (1) { # higher quality darkness
1335# $lighting =~ s/(.)/$1$1$1/gs;
1336# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1337#
1338# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1339#
1340# $lighting = $pb->get_pixels;
1341# $lighting =~ s/(.)../$1/gs;
1342# }
1343
1344 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1345
1346 $darkness = new CFClient::Texture
1347 w => $sw4,
1348 h => $sh,
1349 data => $darkness,
1350 internalformat => GL_ALPHA,
1351 format => GL_ALPHA;
1352
1353 glColor 0.45, 0.45, 0.45, 1;
1354 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1355
1356 glDisable GL_TEXTURE_2D;
1357 glDisable GL_BLEND;
1358
1359 glEndList; 1612 glEndList;
1360 } 1613 }
1361 1614
1362 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 }
1363} 1629}
1364 1630
1365my %DIR = ( 1631my %DIR = (
1366 SDLK_KP8, [1, "north"], 1632 SDLK_KP8, [1, "north"],
1367 SDLK_KP9, [2, "northeast"], 1633 SDLK_KP9, [2, "northeast"],
… …
1383 1649
1384 my $mod = $ev->key_mod; 1650 my $mod = $ev->key_mod;
1385 my $sym = $ev->key_sym; 1651 my $sym = $ev->key_sym;
1386 1652
1387 if ($sym == SDLK_KP5) { 1653 if ($sym == SDLK_KP5) {
1388 $::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');
1389 } elsif (exists $DIR{$sym}) { 1659 } elsif (exists $DIR{$sym}) {
1390 if ($mod & KMOD_SHIFT) { 1660 if ($mod & KMOD_SHIFT) {
1391 $self->{shft}++; 1661 $self->{shft}++;
1392 $::CONN->send ("command fire $DIR{$sym}[0]"); 1662 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1393 } elsif ($mod & KMOD_CTRL) { 1663 } elsif ($mod & KMOD_CTRL) {
1394 $self->{ctrl}++; 1664 $self->{ctrl}++;
1395 $::CONN->send ("command run $DIR{$sym}[0]"); 1665 $::CONN->user_send ("command run $DIR{$sym}[0]");
1396 } else { 1666 } else {
1397 $::CONN->send ("command $DIR{$sym}[1]"); 1667 $::CONN->user_send ("command $DIR{$sym}[1]");
1398 } 1668 }
1399 } 1669 }
1400} 1670}
1401 1671
1402sub key_up { 1672sub key_up {
… …
1404 1674
1405 my $mod = $ev->key_mod; 1675 my $mod = $ev->key_mod;
1406 my $sym = $ev->key_sym; 1676 my $sym = $ev->key_sym;
1407 1677
1408 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1678 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1409 $::CONN->send ("command fire_stop"); 1679 $::CONN->user_send ("command fire_stop");
1410 } 1680 }
1411 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1681 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1412 $::CONN->send ("command run_stop"); 1682 $::CONN->user_send ("command run_stop");
1413 } 1683 }
1414} 1684}
1415 1685
1416############################################################################# 1686#############################################################################
1417 1687
… …
1455 glPopMatrix; 1725 glPopMatrix;
1456} 1726}
1457 1727
1458############################################################################# 1728#############################################################################
1459 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
1460package CFClient::UI::Toplevel; 1768package CFClient::UI::Toplevel;
1461 1769
1462our @ISA = CFClient::UI::Container::; 1770our @ISA = CFClient::UI::Container::;
1463 1771
1464sub size_request { 1772sub size_request {

Diff Legend

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