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.78 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.109 by root, Sat Apr 15 01:13:47 2006 UTC

… …
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71} 71}
72 72
… …
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;
… …
263 272
264 # range [value, low, high, page] 273 # range [value, low, high, page]
265 274
266 $class->SUPER::new ( 275 $class->SUPER::new (
267 bg => [0, 0, 0, 0.2], 276 bg => [0, 0, 0, 0.2],
268 active_bg => [1, 1, 1], 277 active_bg => [1, 1, 1, 0.5],
269 @_ 278 @_
270 ) 279 )
271} 280}
272 281
273sub _draw { 282sub _draw {
… …
430} 439}
431 440
432sub render_chld { 441sub render_chld {
433 my ($self) = @_; 442 my ($self) = @_;
434 443
435 $self->{texture} = 444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
436 CFClient::Texture->new_from_opengl ( 445 glClearColor 0, 0, 0, 1;
437 $self->{w}, $self->{h}, sub { $self->child->draw } 446 glClear GL_COLOR_BUFFER_BIT;
438 ); 447 $self->child->draw;
448 };
439} 449}
440 450
441sub size_allocate { 451sub size_allocate {
442 my ($self, $x, $y, $w, $h) = @_; 452 my ($self, $x, $y, $w, $h) = @_;
443 453
… …
521 531
522my @tex = 532my @tex =
523 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
524 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
525 535
536sub new {
537 my $class = shift;
538
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new (
542 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8,
545 @_
546 )
547}
548
526sub size_request { 549sub size_request {
527 my ($self) = @_; 550 my ($self) = @_;
528 551
529 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
530 553
531 my ($w, $h) = $self->SUPER::size_request; 554 my ($w, $h) = $self->SUPER::size_request;
532 555
533 $h += $tex[1]->{h}; 556 (
534 $h += $tex[4]->{h}; 557 $w + $self->{border} * 2,
535 $w += $tex[2]->{w}; 558 $h + $self->{border} * 2,
536 $w += $tex[3]->{w}; 559 )
537
538 ($w, $h)
539} 560}
540 561
541sub size_allocate { 562sub size_allocate {
542 my ($self, $x, $y, $w, $h) = @_; 563 my ($self, $x, $y, $w, $h) = @_;
543 564
544 $self->_size_allocate ($x, $y, $w, $h) or return; 565 $self->_size_allocate ($x, $y, $w, $h) or return;
545 566
546 $h -= $tex[1]{h}; 567 $h -= List::Util::max 0, $self->{border} * 2;
547 $h -= $tex[4]{h}; 568 $w -= List::Util::max 0, $self->{border} * 2;
548 $w -= $tex[2]{w};
549 $w -= $tex[3]{w};
550 569
551 $h = $h < 0 ? 0 : $h; 570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
552 $w = $w < 0 ? 0 : $w;
553
554 my $child = $self->child;
555
556 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
557} 571}
558 572
559sub button_down { 573sub button_down {
560 my ($self, $ev, $x, $y) = @_; 574 my ($self, $ev, $x, $y) = @_;
561 575
562 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
563 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
564 578
565 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 579 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
566 my ($bw, $bh) = ($self->{w}, $self->{h}); 580 my ($bw, $bh) = ($self->{w}, $self->{h});
567 581
568 $self->{motion} = sub { 582 $self->{motion} = sub {
… …
574 $self->{user_h} = $bh + $y - $oy; 588 $self->{user_h} = $bh + $y - $oy;
575 $self->update; 589 $self->update;
576 }; 590 };
577 591
578 } elsif ($x >= 0 && $x < $self->{w} 592 } elsif ($x >= 0 && $x < $self->{w}
579 && $y >= 0 && $y < $tex[1]{h}) { 593 && $y >= 0 && $y < $self->{border}) {
580 594
581 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 595 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
582 my ($bx, $by) = ($self->{x}, $self->{y}); 596 my ($bx, $by) = ($self->{x}, $self->{y});
583 597
584 $self->{motion} = sub { 598 $self->{motion} = sub {
… …
605} 619}
606 620
607sub _draw { 621sub _draw {
608 my ($self) = @_; 622 my ($self) = @_;
609 623
610 my ($w, $h) = ($self->{w}, $self->{h}); 624 my ($w, $h ) = ($self->{w}, $self->{h});
611 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
612 626
613 glEnable GL_BLEND; 627 glEnable GL_BLEND;
614 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
615 glEnable GL_TEXTURE_2D; 629 glEnable GL_TEXTURE_2D;
616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
617 631
618 my $top = $tex[1]; 632 glColor @{ $self->{border_bg} };
619 $top->draw_quad (0, 0, $w, $top->{h}); 633 $tex[1]->draw_quad (0, 0, $w, $self->{border});
620 634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
621 my $left = $tex[3]; 635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
622 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
623
624 my $right = $tex[2];
625 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
626
627 my $bottom = $tex[4];
628 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
629 637
630 my $bg = $tex[0]; 638 my $bg = $tex[0];
631 639
632 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 # TODO: repeat texture not scale
633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
634 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
635 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
636
637 my $rep_x = $cw / $bg->{w}; 641 my $rep_x = $cw / $bg->{w};
638 my $rep_y = $ch / $bg->{h}; 642 my $rep_y = $ch / $bg->{h};
639 643
644 glColor @{ $self->{bg} };
645
646 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1;
640 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
641 650
642 glDisable GL_TEXTURE_2D; 651 glDisable GL_TEXTURE_2D;
643 glDisable GL_BLEND; 652 glDisable GL_BLEND;
644 653
645 $self->child->draw; 654 $self->child->draw;
646
647} 655}
648 656
649############################################################################# 657#############################################################################
650 658
651package CFClient::UI::Table; 659package CFClient::UI::Table;
… …
725 733
726 # linearly scale sizes 734 # linearly scale sizes
727 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729 737
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems
740
730 my $y; 741 my $y;
731 742
732 for my $r (0 .. $#{$self->{children}}) { 743 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 744 my $row = $self->{children}[$r]
734 or next; 745 or next;
735 746
736 my $x = 0; 747 my $x = 0;
737 my $row_h = $hs->[$r]; 748 my $row_h = $hs->[$r];
738 749
739 for my $c (0 .. $#$row) { 750 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 751 my $col_w = $ws->[$c];
744 752
753 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 754 $widget->size_allocate ($x, $y, $col_w, $row_h);
755 }
746 756
747 $x += $col_w; 757 $x += $col_w;
748 } 758 }
749 759
750 $y += $row_h; 760 $y += $row_h;
… …
796} 806}
797 807
798sub size_allocate { 808sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 809 my ($self, $x, $y, $w, $h) = @_;
800 810
801 $self->_size_allocate ($x, $y, $w, $h) or return; 811 $self->_size_allocate ($x, $y, $w, $h);
802
803 return unless $self->{w};
804 812
805 ($h, $w) = ($w, $h); 813 ($h, $w) = ($w, $h);
806 814
807 my $children = $self->{children}; 815 my $children = $self->{children};
808 816
… …
827 } 835 }
828 836
829 my $y = 0; 837 my $y = 0;
830 for (0 .. $#$children) { 838 for (0 .. $#$children) {
831 my $child = $children->[$_]; 839 my $child = $children->[$_];
832 my $h = $h[$_]; 840 my $h = int $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 841 $child->size_allocate ($y, 0, $h, $w);
834 842
835 $y += $h; 843 $y += $h;
836 } 844 }
837} 845}
… …
856} 864}
857 865
858sub size_allocate { 866sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 867 my ($self, $x, $y, $w, $h) = @_;
860 868
861 $self->_size_allocate ($x, $y, $w, $h) or return; 869 $self->_size_allocate ($x, $y, $w, $h);
862
863 return unless $self->{h};
864 870
865 my $children = $self->{children}; 871 my $children = $self->{children};
866 872
867 my @h = map +($_->size_request)[1], @$children; 873 my @h = map +($_->size_request)[1], @$children;
868 874
… …
883 } 889 }
884 890
885 my $y = 0; 891 my $y = 0;
886 for (0 .. $#$children) { 892 for (0 .. $#$children) {
887 my $child = $children->[$_]; 893 my $child = $children->[$_];
888 my $h = $h[$_]; 894 my $h = int $h[$_];
889 $child->size_allocate (0, $y, $w, $h); 895 $child->size_allocate (0, $y, $w, $h);
890 896
891 $y += $h; 897 $y += $h;
892 } 898 }
893} 899}
… …
902 908
903sub new { 909sub new {
904 my ($class, %arg) = @_; 910 my ($class, %arg) = @_;
905 911
906 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
907 fg => [1, 1, 1], 913 fg => [1, 1, 1],
908 height => $::FONTSIZE, 914 fontsize => $::FONTSIZE,
909 text => "", 915 text => "",
910 align => -1, 916 align => -1,
911 padding => 2, 917 padding => 2,
912 layout => new CFClient::Layout, 918 layout => new CFClient::Layout,
913 %arg 919 %arg
914 ); 920 );
915 921
916 $self->set_text ($self->{text}); 922 $self->set_text ($self->{text});
917 923
… …
933 939
934 $self->{text} = $text; 940 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 941 $self->{layout}->set_markup ($text);
936 942
937 delete $self->{texture}; 943 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
938 $self->update; 945 $self->update;
939} 946}
940 947
941sub get_text { 948sub get_text {
942 my ($self, $text) = @_; 949 my ($self, $text) = @_;
… …
946 953
947sub size_request { 954sub size_request {
948 my ($self) = @_; 955 my ($self) = @_;
949 956
950 $self->{layout}->set_width; 957 $self->{layout}->set_width;
951 $self->{layout}->set_height ($self->{height}); 958 $self->{layout}->set_height ($self->{fontsize});
952 my ($w, $h) = $self->{layout}->size; 959 my ($w, $h) = $self->{layout}->size;
953 960
954 ( 961 (
955 $w + $self->{padding} * 2, 962 $w + $self->{padding} * 2,
956 $h + $self->{padding} * 2, 963 $h + $self->{padding} * 2,
… …
975sub _draw { 982sub _draw {
976 my ($self) = @_; 983 my ($self) = @_;
977 984
978 my $tex = $self->{texture} ||= do { 985 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 986 $self->{layout}->set_width ($self->{w});
980 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
981 new_from_layout CFClient::Texture $self->{layout} 988 new_from_layout CFClient::Texture $self->{layout}
982 }; 989 };
983 990
984 glEnable GL_BLEND; 991 glEnable GL_BLEND;
985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
986 glEnable GL_TEXTURE_2D; 993 glEnable GL_TEXTURE_2D;
987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
988 995
989 glColor @{$self->{fg}}; 996 glColor @{$self->{fg}};
990 997
991 my $x = 998 my $x =
992 $self->{align} < 0 ? $self->{padding} 999 $self->{align} < 0 ? $self->{padding}
993 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994 : ($self->{w} - $tex->{w}) * 0.5; 1001 : ($self->{w} - $tex->{w}) * 0.5;
995 1002
996 $tex->draw_quad ($x, $self->{padding}); 1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
997 1004
998 glDisable GL_TEXTURE_2D; 1005 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1006 glDisable GL_BLEND;
1000} 1007}
1001 1008
… …
1012 my $class = shift; 1019 my $class = shift;
1013 1020
1014 $class->SUPER::new ( 1021 $class->SUPER::new (
1015 fg => [1, 1, 1], 1022 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2], 1023 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1], 1024 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1025 active_fg => [0, 0, 0],
1026 can_hover => 1,
1027 can_focus => 1,
1019 @_ 1028 @_
1020 ) 1029 )
1021} 1030}
1022 1031
1023sub _set_text { 1032sub _set_text {
1024 my ($self, $text) = @_; 1033 my ($self, $text) = @_;
1025 1034
1035 my $old_text = $self->{text};
1036
1026 $self->{last_activity} = $::NOW; 1037 $self->{last_activity} = $::NOW;
1027 1038
1028 $self->{text} = $text; 1039 $self->{text} = $text;
1029 $self->{layout}->set_width ($self->{w}); 1040 $self->{layout}->set_width ($self->{w});
1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1030 1042
1031 $text =~ s/./*/g if $self->{hidden}; 1043 $text =~ s/./*/g if $self->{hidden};
1032 1044
1033 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1045 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1034 1046
1035 $text = substr $text, 0, $self->{cursor}; 1047 $text = substr $text, 0, $self->{cursor};
1036 utf8::encode $text; 1048 utf8::encode $text;
1037 1049
1038 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053 if $old_text ne $self->{text};
1039} 1054}
1040 1055
1041sub size_request { 1056sub size_request {
1042 my ($self) = @_; 1057 my ($self) = @_;
1043 1058
… …
1082 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1097 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1083 } elsif ($sym == SDLK_HOME) { 1098 } elsif ($sym == SDLK_HOME) {
1084 $self->{cursor} = 0; 1099 $self->{cursor} = 0;
1085 } elsif ($sym == SDLK_END) { 1100 } elsif ($sym == SDLK_END) {
1086 $self->{cursor} = length $text; 1101 $self->{cursor} = length $text;
1102 } elsif ($sym == SDLK_ESCAPE) {
1103 $self->emit ('escape');
1087 } elsif ($uni) { 1104 } elsif ($uni) {
1088 substr $text, $self->{cursor}++, 0, chr $uni; 1105 substr $text, $self->{cursor}++, 0, chr $uni;
1089 } 1106 }
1090 1107
1091 $self->_set_text ($text); 1108 $self->_set_text ($text);
… …
1153 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1170 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1154 glEnd; 1171 glEnd;
1155 } 1172 }
1156} 1173}
1157 1174
1158#############################################################################
1159
1160package CFClient::UI::Slider; 1175package CFClient::UI::LineEntry;
1161 1176
1162use strict; 1177our @ISA = CFClient::UI::Entry::;
1163 1178
1179use SDL;
1164use SDL::OpenGL; 1180use SDL::OpenGL;
1165 1181
1182sub key_down {
1183 my ($self, $ev) = @_;
1184
1185 my $sym = $ev->key_sym;
1186
1187 if ($sym == SDLK_RETURN) {
1188 $self->emit (activate => $self->get_text);
1189 $self->update;
1190
1191 } else {
1192 $self->SUPER::key_down ($ev);
1193 }
1194
1195}
1196
1197#############################################################################
1198
1199package CFClient::UI::Button;
1200
1166our @ISA = CFClient::UI::DrawBG::; 1201our @ISA = CFClient::UI::Label::;
1202
1203use SDL;
1204use SDL::OpenGL;
1205
1206my @tex =
1207 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1208 qw(b1_button_active.png);
1167 1209
1168sub new { 1210sub new {
1169 my $class = shift; 1211 my $class = shift;
1170 1212
1213 $class->SUPER::new (
1214 padding => 4,
1215 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0],
1218 can_hover => 1,
1219 @_
1220 )
1221}
1222
1223sub button_up {
1224 my ($self, $ev, $x, $y) = @_;
1225
1226 if ($x >= 0 && $x < $self->{w}
1227 && $y >= 0 && $y < $self->{h}) {
1228 $self->emit ("activate");
1229 }
1230}
1231
1232sub _draw {
1233 my ($self) = @_;
1234
1235 local $self->{fg} = $self->{fg};
1236 my $tex = $tex[0];
1237
1238 glEnable GL_BLEND;
1239 glEnable GL_TEXTURE_2D;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241
1242 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg};
1244 }
1245
1246 glBindTexture GL_TEXTURE_2D, $tex->{name};
1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1248
1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1250
1251 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND;
1253
1254 $self->SUPER::_draw;
1255}
1256
1257#############################################################################
1258
1259package CFClient::UI::CheckBox;
1260
1261our @ISA = CFClient::UI::DrawBG::;
1262
1263my @tex =
1264 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1265 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1266
1267use SDL;
1268use SDL::OpenGL;
1269
1270sub new {
1271 my $class = shift;
1272
1273 $class->SUPER::new (
1274 padding => 2,
1275 fg => [1, 1, 1],
1276 active_fg => [1, 1, 0],
1277 state => 0,
1278 can_hover => 1,
1279 @_
1280 )
1281}
1282
1283sub size_request {
1284 my ($self) = @_;
1285
1286 ($self->{padding} * 2 + 6) x 2
1287}
1288
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293}
1294
1295sub button_down {
1296 my ($self, $ev, $x, $y) = @_;
1297
1298 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1300 $self->{state} = !$self->{state};
1301 $self->emit (changed => $self->{state});
1302 }
1303}
1304
1305sub _draw {
1306 my ($self) = @_;
1307
1308 $self->SUPER::_draw;
1309
1310 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1311
1312 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1313
1314 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1315
1316 glEnable GL_BLEND;
1317 glEnable GL_TEXTURE_2D;
1318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1319
1320 my $tex = $self->{state} ? $tex[1] : $tex[0];
1321
1322 $tex->draw_quad (0, 0, $s, $s);
1323
1324 glDisable GL_TEXTURE_2D;
1325 glDisable GL_BLEND;
1326}
1327
1328#############################################################################
1329
1330package CFClient::UI::Slider;
1331
1332use strict;
1333
1334use SDL::OpenGL;
1335
1336our @ISA = CFClient::UI::DrawBG::;
1337
1338my @tex =
1339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1340 qw(s1_slider.png s1_slider_bg.png);
1341
1342sub new {
1343 my $class = shift;
1344
1171 # range [value, low, high, page] 1345 # range [value, low, high, page]
1172 1346
1347 # TODO: 0-width page
1348 # TODO: req_w/h are wrong with vertical
1349 # TODO: calculations are off
1173 my $self = $class->SUPER::new ( 1350 my $self = $class->SUPER::new (
1174 fg => [1, 1, 1], 1351 fg => [1, 1, 1],
1175 active_fg => [0, 0, 0], 1352 active_fg => [0, 0, 0],
1176 range => [0, 0, 100, 10], 1353 range => [0, 0, 100, 10],
1177 req_w => 40, 1354 req_w => 40,
1178 req_h => 10, 1355 req_h => 13,
1179 vertical => 0, 1356 vertical => 0,
1357 can_hover => 1,
1358 inner_pad => 5,
1180 @_ 1359 @_
1181 ); 1360 );
1182 1361
1183 $self 1362 $self
1184} 1363}
… …
1205 if ($GRAB == $self) { 1384 if ($GRAB == $self) {
1206 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1385 my ($value, $lo, $hi, $page) = @{$self->{range}};
1207 1386
1208 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1387 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1209 1388
1389 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1390 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1391
1392 $x -= $inner_pad_px; # substract the padding
1210 $x = $x * ($hi - $lo) / $w + $lo; 1393 $x = $x * ($hi - $lo) / $inner_w + $lo;
1211 $x = $lo if $x < $lo; 1394 $x = $lo if $x < $lo;
1212 $x = $hi - $page if $x > $hi - $page; 1395 $x = $hi - $page if $x > $hi - $page;
1213 $self->{range}[0] = $x; 1396 $self->{range}[0] = $x;
1214 1397
1215 $self->emit (changed => $x); 1398 $self->emit (changed => $x);
1216 $self->update; 1399 $self->update;
1217 } 1400 }
1401}
1402
1403# the inner_* stuff is for generating a padding for the slider handle,
1404# so that the handle doesn't leave the texture. This calculation isn't 100%
1405# correct propably, but it does the job for now
1406sub _calc_inner_pad_px {
1407 my ($self, $w) = @_;
1408 ($w / 100) * $self->{inner_pad} # % to pixels
1218} 1409}
1219 1410
1220sub _draw { 1411sub _draw {
1221 my ($self) = @_; 1412 my ($self) = @_;
1222 1413
… …
1236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1427 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1428 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1238 1429
1239 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1430 my ($value, $lo, $hi, $page) = @{$self->{range}};
1240 1431
1432 $hi = $value + 1 if $lo == $hi;
1433
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1436
1241 $page = int $page * $w / ($hi - $lo); 1437 $page = int $page * $inner_w / ($hi - $lo);
1242 $value = int +($value - $lo) * $w / ($hi - $lo); 1438 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1243 1439
1244 $w -= $page; 1440 $w -= $page;
1245 $page &= ~1; 1441 $page &= ~1;
1246 glTranslate $page * 0.5, 0, 0; 1442 glTranslate $page * 0.5, 0, 0;
1443 $page ||= 2;
1247 1444
1248 glColor @$fg;
1249 glBegin GL_LINES;
1250 glVertex 0, 0; glVertex 0, $h;
1251 glVertex $w - 1, 0; glVertex $w - 1, $h;
1252 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1253 glEnd;
1254
1255 my $knob_a = $value - $page * 0.5; 1445 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1256 my $knob_b = $value + $page * 0.5; 1446 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1257 1447
1258 glBegin GL_QUADS; 1448 glEnable GL_BLEND;
1259 glColor @$fg; 1449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1260 glVertex $knob_a, 0; 1450 glEnable GL_TEXTURE_2D;
1261 glVertex $knob_a, $h; 1451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1262 glVertex $knob_b, $h;
1263 glVertex $knob_b, 0;
1264 1452
1265 if ($knob_a < $knob_b - 2) { 1453 # draw background
1266 glColor @$bg; 1454 $tex[1]->draw_quad (0, 0, $w, $h);
1267 glVertex $knob_a + 1, 1; 1455
1268 glVertex $knob_a + 1, $h - 1; 1456 # draw handle
1269 glVertex $knob_b - 1, $h - 1; 1457 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1270 glVertex $knob_b - 1, 1; 1458
1459 glDisable GL_BLEND;
1460 glDisable GL_TEXTURE_2D;
1461}
1462
1463#############################################################################
1464
1465package CFClient::UI::TextView;
1466
1467our @ISA = CFClient::UI::HBox::;
1468
1469use SDL::OpenGL;
1470
1471sub new {
1472 my $class = shift;
1473
1474 my $self = $class->SUPER::new (
1475 req_w => $::WIDTH / 6,
1476 req_h => $::HEIGHT / 6,
1477 fontsize => $::FONTSIZE,
1478 @_,
1479
1480 layout => (new CFClient::Layout),
1481 par => [],
1482 height => 0,
1483 children => [
1484 (new CFClient::UI::Empty expand => 1),
1485 (new CFClient::UI::Slider vertical => 1),
1486 ],
1487 );
1488
1489 $self->{children}[1]->connect (changed => sub {
1490 $self->update;
1491 });
1492
1493 $self
1494}
1495
1496sub set_fontsize {
1497 my ($self, $fontsize) = @_;
1498
1499 $self->{fontsize} = $fontsize;
1500 $self->reflow;
1501}
1502
1503sub text_height {
1504 my ($self, $text) = @_;
1505
1506 my $layout = $self->{layout};
1507
1508 $layout->set_height ($self->{fontsize});
1509 $layout->set_width ($self->{w});
1510 $layout->set_text ($text);
1271 } 1511
1272 glEnd; 1512 ($layout->size)[1]
1513}
1514
1515sub reflow {
1516 my ($self) = @_;
1517
1518 $self->{need_reflow}++;
1519 $self->update;
1520}
1521
1522sub size_request {
1523 my ($self) = @_;
1524
1525 ($self->{req_w}, $self->{req_h})
1526}
1527
1528sub size_allocate {
1529 my ($self, $x, $y, $w, $h) = @_;
1530
1531 $self->SUPER::size_allocate ($x, $y, $w, $h);
1532
1533 $self->{layout}->set_height ($self->{fontsize});
1534 $self->{layout}->set_width ($self->{w});
1535
1536 $self->reflow;
1537}
1538
1539sub add_paragraph {
1540 my ($self, $color, $text) = @_;
1541
1542 #TODO: intelligently "reformat" paragraph
1543
1544 my $height = $self->text_height ($text);
1545
1546 $self->{height} += $height;
1547
1548 push @{$self->{par}}, [$height, $color, $text];
1549
1550 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1551 $self->{children}[1]->update;
1552}
1553
1554sub update {
1555 my ($self) = @_;
1556
1557 $self->SUPER::update;
1558
1559 return unless $self->{h} > 0;
1560
1561 delete $self->{texture};
1562
1563 $TOPLEVEL->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) {
1565 my $height = 0;
1566
1567 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}};
1569
1570 $self->{height} = $height;
1571
1572 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1573
1574 delete $self->{texture};
1575 }
1576
1577 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1578 glClearColor 0, 0, 0, 1;
1579 glClear GL_COLOR_BUFFER_BIT;
1580
1581 glEnable GL_BLEND;
1582 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1583 glEnable GL_TEXTURE_2D;
1584 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1585
1586 my $top = int $self->{children}[1]{range}[0];
1587
1588 my $y0 = $top;
1589 my $y1 = $top + $self->{h};
1590
1591 my $y = 0;
1592
1593 my $layout = $self->{layout};
1594
1595 for my $par (@{$self->{par}}) {
1596 my $h = $par->[0];
1597
1598 if ($y0 < $y + $h && $y < $y1) {
1599 $layout->set_text ($par->[2]);
1600
1601 glColor @{ $par->[1] };
1602 my ($W, $H) = $layout->size;
1603 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1604 }
1605
1606 $y += $h;
1607 }
1608
1609 glDisable GL_TEXTURE_2D;
1610 glDisable GL_BLEND;
1611 };
1612 });
1613}
1614
1615sub _draw {
1616 my ($self) = @_;
1617
1618 if ($self->{texture}) {
1619 glEnable GL_TEXTURE_2D;
1620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1621 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1622 glDisable GL_TEXTURE_2D;
1623 }
1624
1625 $self->{children}[1]->draw;
1626
1273} 1627}
1274 1628
1275############################################################################# 1629#############################################################################
1276 1630
1277package CFClient::UI::MapWidget; 1631package CFClient::UI::MapWidget;
… …
1287 1641
1288sub new { 1642sub new {
1289 my $class = shift; 1643 my $class = shift;
1290 1644
1291 $class->SUPER::new ( 1645 $class->SUPER::new (
1292 z => -1, 1646 z => -1,
1647 can_focus => 1,
1293 list => (glGenLists 1), 1648 list => (glGenLists 1),
1294 @_ 1649 @_
1295 ) 1650 )
1296} 1651}
1297 1652
1298sub key_down { 1653sub key_down {
1299 print "MAPKEYDOWN\n"; 1654 print "MAPKEYDOWN\n";
1300} 1655}
1301 1656
1302sub key_up { 1657sub key_up {
1658}
1659
1660sub button_down {
1661 my ($self, $ev, $x, $y) = @_;
1662
1663 $self->focus_in;
1664
1665 if ($ev->button == 2) {
1666 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1667 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1668
1669 $self->{motion} = sub {
1670 my ($ev, $x, $y) = @_;
1671
1672 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1673
1674 $::CFG->{map_shift_x} = $bw + $x - $ox;
1675 $::CFG->{map_shift_y} = $bh + $y - $oy;
1676
1677 $self->update;
1678 };
1679 }
1680}
1681
1682sub button_up {
1683 my ($self, $ev, $x, $y) = @_;
1684
1685 delete $self->{motion};
1686}
1687
1688sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_;
1690
1691 $self->{motion}->($ev, $x, $y) if $self->{motion};
1303} 1692}
1304 1693
1305sub size_request { 1694sub size_request {
1306 ( 1695 (
1307 1 + 32 * int $::WIDTH / 32, 1696 1 + 32 * int $::WIDTH / 32,
… …
1320 my ($self) = @_; 1709 my ($self) = @_;
1321 1710
1322 if (delete $self->{need_update}) { 1711 if (delete $self->{need_update}) {
1323 glNewList $self->{list}, GL_COMPILE; 1712 glNewList $self->{list}, GL_COMPILE;
1324 1713
1325 my $mx = $::CONN->{mapx}; 1714 if ($::MAP) {
1326 my $my = $::CONN->{mapy};
1327
1328 my $map = $::CONN->{map};
1329
1330 my ($xofs, $yofs);
1331
1332 my $sw = 1 + int $::WIDTH / 32; 1715 my $sw = int $::WIDTH / 32;
1333 my $sh = 1 + int $::HEIGHT / 32; 1716 my $sh = int $::HEIGHT / 32;
1334 1717
1335 if ($::CONN->{mapw} > $sw) { 1718 my $sx = $::CFG->{map_shift_x};
1336 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1719 my $sy = $::CFG->{map_shift_y};
1337 } else { 1720
1338 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1721 glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0;
1722
1723 my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1);
1724
1725 if ($::CFG->{fow_enable}) {
1726 if ($::CFG->{fow_smooth}) { # smooth fog of war
1727 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1728 glConvolutionFilter2D
1729 GL_CONVOLUTION_2D,
1730 GL_ALPHA,
1731 3, 3,
1732 GL_ALPHA, GL_FLOAT,
1733 pack "f*",
1734 0.1, 0.1, 0.1,
1735 0.1, 0.2, 0.1,
1736 0.1, 0.1, 0.1,
1737 ;
1738 glEnable GL_CONVOLUTION_2D;
1739 }
1740
1741 my $tex = new CFClient::Texture
1742 w => $w,
1743 h => $h,
1744 data => $data,
1745 internalformat => GL_ALPHA,
1746 format => GL_ALPHA;
1747
1748 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1749
1750 glEnable GL_BLEND;
1751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1752 glEnable GL_TEXTURE_2D;
1753 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1754
1755 glColor +($::CFG->{fow_intensity}) x 3, 1;
1756 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1757
1758 glDisable GL_TEXTURE_2D;
1759 glDisable GL_BLEND;
1760 }
1761
1762 # HACK BEGIN
1763 {
1764 my ($w, $h) = (250, 250);
1765
1766 glEnable GL_BLEND;
1767 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1768 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770
1771 CFClient::Texture->new (
1772 w => $w,
1773 h => $h,
1774 data => $::MAP->mapmap ($w, $h),
1775 type => GL_UNSIGNED_INT_8_8_8_8_REV
1776 )->draw_quad (100, 100);
1777
1778 glDisable GL_TEXTURE_2D;
1779 glDisable GL_BLEND;
1780 }
1781 # HACK END
1339 } 1782 }
1340 1783
1341 if ($::CONN->{maph} > $sh) {
1342 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1343 } else {
1344 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1345 }
1346
1347 glEnable GL_TEXTURE_2D;
1348 glEnable GL_BLEND;
1349 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1351
1352 my $sw4 = ($sw + 3) & ~3;
1353 my $darkness = "\x00" x ($sw4 * $sh);
1354
1355 for my $x (0 .. $sw - 1) {
1356 my $row = $map->[$x + $xofs];
1357 for my $y (0 .. $sh - 1) {
1358
1359 my $cell = $row->[$y + $yofs]
1360 or next;
1361
1362 my $dark = $cell->[0];
1363 if ($dark < 0) {
1364 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1365 } else {
1366 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1367 }
1368
1369 for my $num (grep $_, @$cell[1,2,3]) {
1370 my $tex = $::CONN->{face}[$num]{texture} || next;
1371
1372 my ($w, $h) = @$tex{qw(w h)};
1373
1374 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1375 }
1376 }
1377 }
1378
1379# if (1) { # higher quality darkness
1380# $lighting =~ s/(.)/$1$1$1/gs;
1381# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1382#
1383# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1384#
1385# $lighting = $pb->get_pixels;
1386# $lighting =~ s/(.)../$1/gs;
1387# }
1388
1389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1390
1391 $darkness = new CFClient::Texture
1392 w => $sw4,
1393 h => $sh,
1394 data => $darkness,
1395 internalformat => GL_ALPHA,
1396 format => GL_ALPHA;
1397
1398 glColor 0.45, 0.45, 0.45, 1;
1399 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1400
1401 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403
1404 glEndList; 1784 glEndList;
1405 } 1785 }
1406 1786
1787 glPushMatrix;
1407 glCallList $self->{list}; 1788 glCallList $self->{list};
1789 glPopMatrix;
1790
1791 if ($FOCUS != $self) {
1792 glColor 64/255, 64/255, 64/255;
1793 glLogicOp GL_AND;
1794 glEnable GL_COLOR_LOGIC_OP;
1795 glBegin GL_QUADS;
1796 glVertex 0, 0;
1797 glVertex 0, $::HEIGHT;
1798 glVertex $::WIDTH, $::HEIGHT;
1799 glVertex $::WIDTH, 0;
1800 glEnd;
1801 glDisable GL_COLOR_LOGIC_OP;
1802 }
1408} 1803}
1409 1804
1410my %DIR = ( 1805my %DIR = (
1411 SDLK_KP8, [1, "north"], 1806 SDLK_KP8, [1, "north"],
1412 SDLK_KP9, [2, "northeast"], 1807 SDLK_KP9, [2, "northeast"],
… …
1428 1823
1429 my $mod = $ev->key_mod; 1824 my $mod = $ev->key_mod;
1430 my $sym = $ev->key_sym; 1825 my $sym = $ev->key_sym;
1431 1826
1432 if ($sym == SDLK_KP5) { 1827 if ($sym == SDLK_KP5) {
1433 $::CONN->send ("command stay fire"); 1828 $::CONN->user_send ("command stay fire");
1829 } elsif ($sym == SDLK_a) {
1830 $::CONN->user_send ("command apply");
1831 } elsif ($sym == SDLK_QUOTE) {
1832 $self->emit ('activate_console');
1833 } elsif ($sym == SDLK_SLASH) {
1834 $self->emit ('activate_console' => '/');
1434 } elsif (exists $DIR{$sym}) { 1835 } elsif (exists $DIR{$sym}) {
1435 if ($mod & KMOD_SHIFT) { 1836 if ($mod & KMOD_SHIFT) {
1436 $self->{shft}++; 1837 $self->{shft}++;
1437 $::CONN->send ("command fire $DIR{$sym}[0]"); 1838 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1438 } elsif ($mod & KMOD_CTRL) { 1839 } elsif ($mod & KMOD_CTRL) {
1439 $self->{ctrl}++; 1840 $self->{ctrl}++;
1440 $::CONN->send ("command run $DIR{$sym}[0]"); 1841 $::CONN->user_send ("command run $DIR{$sym}[0]");
1441 } else { 1842 } else {
1442 $::CONN->send ("command $DIR{$sym}[1]"); 1843 $::CONN->user_send ("command $DIR{$sym}[1]");
1443 } 1844 }
1444 } 1845 }
1445} 1846}
1446 1847
1447sub key_up { 1848sub key_up {
… …
1449 1850
1450 my $mod = $ev->key_mod; 1851 my $mod = $ev->key_mod;
1451 my $sym = $ev->key_sym; 1852 my $sym = $ev->key_sym;
1452 1853
1453 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1854 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1454 $::CONN->send ("command fire_stop"); 1855 $::CONN->user_send ("command fire_stop");
1455 } 1856 }
1456 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1857 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1457 $::CONN->send ("command run_stop"); 1858 $::CONN->user_send ("command run_stop");
1458 } 1859 }
1459} 1860}
1460 1861
1461############################################################################# 1862#############################################################################
1462 1863
… …
1500 glPopMatrix; 1901 glPopMatrix;
1501} 1902}
1502 1903
1503############################################################################# 1904#############################################################################
1504 1905
1906package CFClient::UI::Flopper;
1907
1908our @ISA = CFClient::UI::Button::;
1909
1910sub new {
1911 my $class = shift;
1912
1913 my $self = $class->SUPER::new (
1914 state => 0,
1915 connect_activate => \&toggle_flopper,
1916 @_
1917 );
1918
1919 if ($self->{state}) {
1920 $self->{state} = 0;
1921 $self->toggle_flopper;
1922 }
1923
1924 $self
1925}
1926
1927sub toggle_flopper {
1928 my ($self) = @_;
1929
1930 # TODO: use animation
1931 if ($self->{state} = !$self->{state}) {
1932 $CFClient::UI::TOPLEVEL->add ($self->{other});
1933 $self->{other}->move (
1934 ($::WIDTH - $self->{other}{w}) * 0.5,
1935 ($::HEIGHT - $self->{other}{h}) * 0.5,
1936 );
1937 } else {
1938 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1939 }
1940}
1941
1942#############################################################################
1943
1505package CFClient::UI::Toplevel; 1944package CFClient::UI::Toplevel;
1506 1945
1507our @ISA = CFClient::UI::Container::; 1946our @ISA = CFClient::UI::Container::;
1947
1948use SDL::OpenGL;
1508 1949
1509sub size_request { 1950sub size_request {
1510 ($::WIDTH, $::HEIGHT) 1951 ($::WIDTH, $::HEIGHT)
1511} 1952}
1512 1953
… …
1538 $self->SUPER::add ($widget); 1979 $self->SUPER::add ($widget);
1539 1980
1540 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 1981 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1541} 1982}
1542 1983
1984sub on_refresh {
1985 my ($self, $id, $cb) = @_;
1986
1987 $self->{refresh_hook}{$id} = $cb;
1988}
1989
1543sub draw { 1990sub draw {
1544 my ($self) = @_; 1991 my ($self) = @_;
1545 1992
1993 while (my $rcb = delete $self->{refresh_hook}) {
1994 $_->() for values %$rcb;
1995 }
1996
1997 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1998 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1999 glClear GL_COLOR_BUFFER_BIT;
2000
2001 glMatrixMode GL_PROJECTION;
2002 glLoadIdentity;
2003 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2004 glMatrixMode GL_MODELVIEW;
2005 glLoadIdentity;
2006
1546 $self->_draw; 2007 $self->_draw;
1547} 2008}
1548 2009
1549############################################################################# 2010#############################################################################
1550 2011

Diff Legend

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