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.79 by root, Wed Apr 12 00:26:50 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 12:29:46 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}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for ($vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
133 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
134 147
135 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
136} 149}
137 150
138# translate global koordinates to local coordinate system 151# translate global coordinates to local coordinate system
139sub translate { 152sub translate {
140 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
141 154
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
143} 156}
144 157
145sub focus_in { 158sub focus_in {
146 my ($self) = @_; 159 my ($self) = @_;
147 160
148 return if $FOCUS == $self; 161 return if $FOCUS == $self;
162 return unless $self->{can_focus};
149 163
150 my $focus = $FOCUS; $FOCUS = $self; 164 my $focus = $FOCUS; $FOCUS = $self;
151 $focus->update if $focus; 165 $focus->update if $focus;
152 $FOCUS->update; 166 $FOCUS->update;
153} 167}
186 glPushMatrix; 200 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 201 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 202 $self->_draw;
189 glPopMatrix; 203 glPopMatrix;
190 204
191 if ($self == $HOVER) { 205 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 206 my ($x, $y) = @$self{qw(x y)};
193 207
194 glColor 0, 0, 1, 0.2; 208 glColor 0, 0, 1, 0.2;
195 glEnable GL_BLEND; 209 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
438} 452}
439 453
440sub render_chld { 454sub render_chld {
441 my ($self) = @_; 455 my ($self) = @_;
442 456
443 $self->{texture} = 457 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444 CFClient::Texture->new_from_opengl ( 458 glClearColor 0, 0, 0, 1;
445 $self->{w}, $self->{h}, sub { $self->child->draw } 459 glClear GL_COLOR_BUFFER_BIT;
446 ); 460 $self->child->draw;
461 };
447} 462}
448 463
449sub size_allocate { 464sub size_allocate {
450 my ($self, $x, $y, $w, $h) = @_; 465 my ($self, $x, $y, $w, $h) = @_;
451 466
529 544
530my @tex = 545my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 546 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 547 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533 548
549sub new {
550 my $class = shift;
551
552 # TODO: user_x, user_y, overwrite moveto?
553
554 $class->SUPER::new (
555 bg => [1, 1, 1, 1],
556 border_bg => [1, 1, 1, 1],
557 border => $::FONTSIZE * 0.8,
558 @_
559 )
560}
561
534sub size_request { 562sub size_request {
535 my ($self) = @_; 563 my ($self) = @_;
536 564
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 565 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538 566
539 my ($w, $h) = $self->SUPER::size_request; 567 my ($w, $h) = $self->SUPER::size_request;
540 568
541 $h += $tex[1]->{h}; 569 (
542 $h += $tex[4]->{h}; 570 $w + $self->{border} * 2,
543 $w += $tex[2]->{w}; 571 $h + $self->{border} * 2,
544 $w += $tex[3]->{w}; 572 )
545
546 ($w, $h)
547} 573}
548 574
549sub size_allocate { 575sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_; 576 my ($self, $x, $y, $w, $h) = @_;
551 577
552 $self->_size_allocate ($x, $y, $w, $h) or return; 578 $self->_size_allocate ($x, $y, $w, $h) or return;
553 579
554 $h -= $tex[1]{h}; 580 $h -= List::Util::max 0, $self->{border} * 2;
555 $h -= $tex[4]{h}; 581 $w -= List::Util::max 0, $self->{border} * 2;
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558 582
559 $h = $h < 0 ? 0 : $h; 583 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
560 $w = $w < 0 ? 0 : $w;
561
562 my $child = $self->child;
563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565} 584}
566 585
567sub button_down { 586sub button_down {
568 my ($self, $ev, $x, $y) = @_; 587 my ($self, $ev, $x, $y) = @_;
569 588
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 589 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 590 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572 591
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 592 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h}); 593 my ($bw, $bh) = ($self->{w}, $self->{h});
575 594
576 $self->{motion} = sub { 595 $self->{motion} = sub {
582 $self->{user_h} = $bh + $y - $oy; 601 $self->{user_h} = $bh + $y - $oy;
583 $self->update; 602 $self->update;
584 }; 603 };
585 604
586 } elsif ($x >= 0 && $x < $self->{w} 605 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) { 606 && $y >= 0 && $y < $self->{border}) {
588 607
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 608 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y}); 609 my ($bx, $by) = ($self->{x}, $self->{y});
591 610
592 $self->{motion} = sub { 611 $self->{motion} = sub {
613} 632}
614 633
615sub _draw { 634sub _draw {
616 my ($self) = @_; 635 my ($self) = @_;
617 636
618 my ($w, $h) = ($self->{w}, $self->{h}); 637 my ($w, $h ) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 638 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 639
621 glEnable GL_BLEND; 640 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 642 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625 644
626 my $top = $tex[1]; 645 glColor @{ $self->{border_bg} };
627 $top->draw_quad (0, 0, $w, $top->{h}); 646 $tex[1]->draw_quad (0, 0, $w, $self->{border});
628 647 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629 my $left = $tex[3]; 648 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 649 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
631
632 my $right = $tex[2];
633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635 my $bottom = $tex[4];
636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637 650
638 my $bg = $tex[0]; 651 my $bg = $tex[0];
639 652
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 653 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
643 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
644
645 my $rep_x = $cw / $bg->{w}; 654 my $rep_x = $cw / $bg->{w};
646 my $rep_y = $ch / $bg->{h}; 655 my $rep_y = $ch / $bg->{h};
647 656
657 glColor @{ $self->{bg} };
658
659 $bg->{s} = $rep_x;
660 $bg->{t} = $rep_y;
661 $bg->{wrap_mode} = 1;
648 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 662 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
649 663
650 glDisable GL_TEXTURE_2D; 664 glDisable GL_TEXTURE_2D;
651 glDisable GL_BLEND; 665 glDisable GL_BLEND;
652 666
653 $self->child->draw; 667 $self->child->draw;
654
655} 668}
656 669
657############################################################################# 670#############################################################################
658 671
659package CFClient::UI::Table; 672package CFClient::UI::Table;
733 746
734 # linearly scale sizes 747 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 748 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 749 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 750
751 CFClient::UI::harmonize $ws;
752 CFClient::UI::harmonize $hs;
753
738 my $y; 754 my $y;
739 755
740 for my $r (0 .. $#{$self->{children}}) { 756 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r] 757 my $row = $self->{children}[$r]
742 or next; 758 or next;
743 759
744 my $x = 0; 760 my $x = 0;
745 my $row_h = $hs->[$r]; 761 my $row_h = $hs->[$r];
746 762
747 for my $c (0 .. $#$row) { 763 for my $c (0 .. $#$row) {
748 my $widget = $row->[$c]
749 or next;
750
751 my $col_w = $ws->[$c]; 764 my $col_w = $ws->[$c];
752 765
766 if (my $widget = $row->[$c]) {
753 $widget->size_allocate ($x, $y, $col_w, $row_h); 767 $widget->size_allocate ($x, $y, $col_w, $row_h);
768 }
754 769
755 $x += $col_w; 770 $x += $col_w;
756 } 771 }
757 772
758 $y += $row_h; 773 $y += $row_h;
804} 819}
805 820
806sub size_allocate { 821sub size_allocate {
807 my ($self, $x, $y, $w, $h) = @_; 822 my ($self, $x, $y, $w, $h) = @_;
808 823
809 $self->_size_allocate ($x, $y, $w, $h) or return; 824 $self->_size_allocate ($x, $y, $w, $h);
810
811 return unless $self->{w};
812 825
813 ($h, $w) = ($w, $h); 826 ($h, $w) = ($w, $h);
814 827
815 my $children = $self->{children}; 828 my $children = $self->{children};
816 829
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 845 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 846 $h[$_] = $alloc_h;
834 } 847 }
835 } 848 }
836 849
850 CFClient::UI::harmonize \@h;
851
837 my $y = 0; 852 my $y = 0;
838 for (0 .. $#$children) { 853 for (0 .. $#$children) {
839 my $child = $children->[$_]; 854 my $child = $children->[$_];
840 my $h = $h[$_]; 855 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 856 $child->size_allocate ($y, 0, $h, $w);
864} 879}
865 880
866sub size_allocate { 881sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_; 882 my ($self, $x, $y, $w, $h) = @_;
868 883
869 $self->_size_allocate ($x, $y, $w, $h) or return; 884 $self->_size_allocate ($x, $y, $w, $h);
870
871 return unless $self->{h};
872 885
873 my $children = $self->{children}; 886 my $children = $self->{children};
874 887
875 my @h = map +($_->size_request)[1], @$children; 888 my @h = map +($_->size_request)[1], @$children;
876 889
888 901
889 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 902 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
890 } 903 }
891 } 904 }
892 905
906 CFClient::UI::harmonize \@h;
907
893 my $y = 0; 908 my $y = 0;
894 for (0 .. $#$children) { 909 for (0 .. $#$children) {
895 my $child = $children->[$_]; 910 my $child = $children->[$_];
896 my $h = $h[$_]; 911 my $h = $h[$_];
897 $child->size_allocate (0, $y, $w, $h); 912 $child->size_allocate (0, $y, $w, $h);
910 925
911sub new { 926sub new {
912 my ($class, %arg) = @_; 927 my ($class, %arg) = @_;
913 928
914 my $self = $class->SUPER::new ( 929 my $self = $class->SUPER::new (
915 fg => [1, 1, 1], 930 fg => [1, 1, 1],
916 height => $::FONTSIZE, 931 fontsize => $::FONTSIZE,
917 text => "", 932 text => "",
918 align => -1, 933 align => -1,
919 padding => 2, 934 padding => 2,
920 layout => new CFClient::Layout, 935 layout => new CFClient::Layout,
921 %arg 936 %arg
922 ); 937 );
923 938
924 $self->set_text ($self->{text}); 939 $self->set_text ($self->{text});
925 940
941 956
942 $self->{text} = $text; 957 $self->{text} = $text;
943 $self->{layout}->set_markup ($text); 958 $self->{layout}->set_markup ($text);
944 959
945 delete $self->{texture}; 960 delete $self->{texture};
961# $self->{w} = $self->{h} = -1;
946 $self->update; 962 $self->update;
947} 963}
948 964
949sub get_text { 965sub get_text {
950 my ($self, $text) = @_; 966 my ($self, $text) = @_;
954 970
955sub size_request { 971sub size_request {
956 my ($self) = @_; 972 my ($self) = @_;
957 973
958 $self->{layout}->set_width; 974 $self->{layout}->set_width;
959 $self->{layout}->set_height ($self->{height}); 975 $self->{layout}->set_height ($self->{fontsize});
960 my ($w, $h) = $self->{layout}->size; 976 my ($w, $h) = $self->{layout}->size;
961 977
962 ( 978 (
963 $w + $self->{padding} * 2, 979 $w + $self->{padding} * 2,
964 $h + $self->{padding} * 2, 980 $h + $self->{padding} * 2,
983sub _draw { 999sub _draw {
984 my ($self) = @_; 1000 my ($self) = @_;
985 1001
986 my $tex = $self->{texture} ||= do { 1002 my $tex = $self->{texture} ||= do {
987 $self->{layout}->set_width ($self->{w}); 1003 $self->{layout}->set_width ($self->{w});
988 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 1004 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
989 new_from_layout CFClient::Texture $self->{layout} 1005 new_from_layout CFClient::Texture $self->{layout}
990 }; 1006 };
991 1007
992 glEnable GL_BLEND; 1008 glEnable GL_BLEND;
993 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1009 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
994 glEnable GL_TEXTURE_2D; 1010 glEnable GL_TEXTURE_2D;
995 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1011 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
996 1012
997 glColor @{$self->{fg}}; 1013 glColor @{$self->{fg}};
998 1014
999 my $x = 1015 my $x =
1000 $self->{align} < 0 ? $self->{padding} 1016 $self->{align} < 0 ? $self->{padding}
1001 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1017 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1002 : ($self->{w} - $tex->{w}) * 0.5; 1018 : ($self->{w} - $tex->{w}) * 0.5;
1003 1019
1004 $tex->draw_quad ($x, $self->{padding}); 1020 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1005 1021
1006 glDisable GL_TEXTURE_2D; 1022 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND; 1023 glDisable GL_BLEND;
1008} 1024}
1009 1025
1022 $class->SUPER::new ( 1038 $class->SUPER::new (
1023 fg => [1, 1, 1], 1039 fg => [1, 1, 1],
1024 bg => [0, 0, 0, 0.2], 1040 bg => [0, 0, 0, 0.2],
1025 active_bg => [1, 1, 1, 0.5], 1041 active_bg => [1, 1, 1, 0.5],
1026 active_fg => [0, 0, 0], 1042 active_fg => [0, 0, 0],
1043 can_hover => 1,
1044 can_focus => 1,
1027 @_ 1045 @_
1028 ) 1046 )
1029} 1047}
1030 1048
1031sub _set_text { 1049sub _set_text {
1032 my ($self, $text) = @_; 1050 my ($self, $text) = @_;
1033 1051
1052 my $old_text = $self->{text};
1053
1034 $self->{last_activity} = $::NOW; 1054 $self->{last_activity} = $::NOW;
1035 1055
1036 $self->{text} = $text; 1056 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w}); 1057 $self->{layout}->set_width ($self->{w});
1058 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1038 1059
1039 $text =~ s/./*/g if $self->{hidden}; 1060 $text =~ s/./*/g if $self->{hidden};
1040 1061
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1062 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042 1063
1043 $text = substr $text, 0, $self->{cursor}; 1064 $text = substr $text, 0, $self->{cursor};
1044 utf8::encode $text; 1065 utf8::encode $text;
1045 1066
1046 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1068
1069 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1070 if $old_text ne $self->{text};
1047} 1071}
1048 1072
1049sub size_request { 1073sub size_request {
1050 my ($self) = @_; 1074 my ($self) = @_;
1051 1075
1090 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1114 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1091 } elsif ($sym == SDLK_HOME) { 1115 } elsif ($sym == SDLK_HOME) {
1092 $self->{cursor} = 0; 1116 $self->{cursor} = 0;
1093 } elsif ($sym == SDLK_END) { 1117 } elsif ($sym == SDLK_END) {
1094 $self->{cursor} = length $text; 1118 $self->{cursor} = length $text;
1119 } elsif ($sym == SDLK_ESCAPE) {
1120 $self->emit ('escape');
1095 } elsif ($uni) { 1121 } elsif ($uni) {
1096 substr $text, $self->{cursor}++, 0, chr $uni; 1122 substr $text, $self->{cursor}++, 0, chr $uni;
1097 } 1123 }
1098 1124
1099 $self->_set_text ($text); 1125 $self->_set_text ($text);
1161 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1187 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162 glEnd; 1188 glEnd;
1163 } 1189 }
1164} 1190}
1165 1191
1166#############################################################################
1167
1168package CFClient::UI::Button; 1192package CFClient::UI::LineEntry;
1169 1193
1170our @ISA = CFClient::UI::Label::; 1194our @ISA = CFClient::UI::Entry::;
1171 1195
1172use SDL; 1196use SDL;
1173use SDL::OpenGL; 1197use SDL::OpenGL;
1198
1199sub key_down {
1200 my ($self, $ev) = @_;
1201
1202 my $sym = $ev->key_sym;
1203
1204 if ($sym == SDLK_RETURN) {
1205 $self->emit (activate => $self->get_text);
1206 $self->update;
1207
1208 } else {
1209 $self->SUPER::key_down ($ev);
1210 }
1211
1212}
1213
1214#############################################################################
1215
1216package CFClient::UI::Button;
1217
1218our @ISA = CFClient::UI::Label::;
1219
1220use SDL;
1221use SDL::OpenGL;
1222
1223my @tex =
1224 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1225 qw(b1_button_active.png);
1174 1226
1175sub new { 1227sub new {
1176 my $class = shift; 1228 my $class = shift;
1177 1229
1178 $class->SUPER::new ( 1230 $class->SUPER::new (
1179 padding => 4, 1231 padding => 4,
1180 fg => [1, 1, 1], 1232 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1233 bg => [1, 1, 1, 0.2],
1182 active_bg => [0, 0, 0, 0.5],
1183 active_fg => [1, 1, 0], 1234 active_fg => [1, 1, 0],
1184 border_fg => [1, 1, 0], 1235 can_hover => 1,
1185 @_ 1236 @_
1186 ) 1237 )
1187} 1238}
1188 1239
1189sub button_up { 1240sub button_up {
1197 1248
1198sub _draw { 1249sub _draw {
1199 my ($self) = @_; 1250 my ($self) = @_;
1200 1251
1201 local $self->{fg} = $self->{fg}; 1252 local $self->{fg} = $self->{fg};
1253 my $tex = $tex[0];
1202 1254
1203 glEnable GL_BLEND; 1255 glEnable GL_BLEND;
1256 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1257 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 1258
1206 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1207
1208 glBegin GL_LINE_LOOP;
1209 glColor @{$self->{border_fg}};
1210 glVertex 1 , 1;
1211 glVertex 1 , $self->{h} - 2;
1212 glVertex $self->{w} - 2, $self->{h} - 2;
1213 glVertex $self->{w} - 2, 1;
1214 glEnd;
1215
1216 if ($GRAB == $self) { 1259 if ($GRAB == $self) {
1217 glColor @{$self->{active_bg}};
1218 $self->{fg} = $self->{active_fg}; 1260 $self->{fg} = $self->{active_fg};
1219 } else {
1220 glColor @{$self->{bg}};
1221 } 1261 }
1222 1262
1223 glBegin GL_QUADS; 1263 glBindTexture GL_TEXTURE_2D, $tex->{name};
1224 glVertex 2 , 2; 1264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1225 glVertex 2 , $self->{h} - 2; 1265
1226 glVertex $self->{w} - 2, $self->{h} - 2; 1266 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1227 glVertex $self->{w} - 2, 2; 1267
1228 glEnd; 1268 glDisable GL_TEXTURE_2D;
1229 glDisable GL_BLEND; 1269 glDisable GL_BLEND;
1230 1270
1231 $self->SUPER::_draw; 1271 $self->SUPER::_draw;
1232} 1272}
1233 1273
1234############################################################################# 1274#############################################################################
1235 1275
1236package CFClient::UI::Slider; 1276package CFClient::UI::CheckBox;
1237 1277
1238use strict; 1278our @ISA = CFClient::UI::DrawBG::;
1239 1279
1280my @tex =
1281 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1282 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1283
1284use SDL;
1240use SDL::OpenGL; 1285use SDL::OpenGL;
1241
1242our @ISA = CFClient::UI::DrawBG::;
1243 1286
1244sub new { 1287sub new {
1245 my $class = shift; 1288 my $class = shift;
1246 1289
1290 $class->SUPER::new (
1291 padding => 2,
1292 fg => [1, 1, 1],
1293 active_fg => [1, 1, 0],
1294 state => 0,
1295 can_hover => 1,
1296 @_
1297 )
1298}
1299
1300sub size_request {
1301 my ($self) = @_;
1302
1303 ($self->{padding} * 2 + 6) x 2
1304}
1305
1306sub size_allocate {
1307 my ($self, $x, $y, $w, $h) = @_;
1308
1309 $self->_size_allocate ($x, $y, $w, $h);
1310}
1311
1312sub button_down {
1313 my ($self, $ev, $x, $y) = @_;
1314
1315 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1316 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1317 $self->{state} = !$self->{state};
1318 $self->emit (changed => $self->{state});
1319 }
1320}
1321
1322sub _draw {
1323 my ($self) = @_;
1324
1325 $self->SUPER::_draw;
1326
1327 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1328
1329 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1330
1331 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1332
1333 glEnable GL_BLEND;
1334 glEnable GL_TEXTURE_2D;
1335 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1336
1337 my $tex = $self->{state} ? $tex[1] : $tex[0];
1338
1339 $tex->draw_quad (0, 0, $s, $s);
1340
1341 glDisable GL_TEXTURE_2D;
1342 glDisable GL_BLEND;
1343}
1344
1345#############################################################################
1346
1347package CFClient::UI::Slider;
1348
1349use strict;
1350
1351use SDL::OpenGL;
1352
1353our @ISA = CFClient::UI::DrawBG::;
1354
1355my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1357 qw(s1_slider.png s1_slider_bg.png);
1358
1359sub new {
1360 my $class = shift;
1361
1247 # range [value, low, high, page] 1362 # range [value, low, high, page]
1248 1363
1364 # TODO: 0-width page
1365 # TODO: req_w/h are wrong with vertical
1366 # TODO: calculations are off
1249 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1250 fg => [1, 1, 1], 1368 fg => [1, 1, 1],
1251 active_fg => [0, 0, 0], 1369 active_fg => [0, 0, 0],
1252 range => [0, 0, 100, 10], 1370 range => [0, 0, 100, 10],
1253 req_w => 40, 1371 req_w => 40,
1254 req_h => 10, 1372 req_h => 13,
1255 vertical => 0, 1373 vertical => 0,
1374 can_hover => 1,
1375 inner_pad => 5,
1256 @_ 1376 @_
1257 ); 1377 );
1258 1378
1259 $self 1379 $self
1260} 1380}
1281 if ($GRAB == $self) { 1401 if ($GRAB == $self) {
1282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1402 my ($value, $lo, $hi, $page) = @{$self->{range}};
1283 1403
1284 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1404 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1285 1405
1406 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1407 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1408
1409 $x -= $inner_pad_px; # substract the padding
1286 $x = $x * ($hi - $lo) / $w + $lo; 1410 $x = $x * ($hi - $lo) / $inner_w + $lo;
1287 $x = $lo if $x < $lo; 1411 $x = $lo if $x < $lo;
1288 $x = $hi - $page if $x > $hi - $page; 1412 $x = $hi - $page if $x > $hi - $page;
1289 $self->{range}[0] = $x; 1413 $self->{range}[0] = $x;
1290 1414
1291 $self->emit (changed => $x); 1415 $self->emit (changed => $x);
1292 $self->update; 1416 $self->update;
1293 } 1417 }
1418}
1419
1420# the inner_* stuff is for generating a padding for the slider handle,
1421# so that the handle doesn't leave the texture. This calculation isn't 100%
1422# correct propably, but it does the job for now
1423sub _calc_inner_pad_px {
1424 my ($self, $w) = @_;
1425 ($w / 100) * $self->{inner_pad} # % to pixels
1294} 1426}
1295 1427
1296sub _draw { 1428sub _draw {
1297 my ($self) = @_; 1429 my ($self) = @_;
1298 1430
1312 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1444 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1313 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1445 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1314 1446
1315 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1447 my ($value, $lo, $hi, $page) = @{$self->{range}};
1316 1448
1449 $hi = $value + 1 if $lo == $hi;
1450
1451 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1452 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1453
1317 $page = int $page * $w / ($hi - $lo); 1454 $page = int $page * $inner_w / ($hi - $lo);
1318 $value = int +($value - $lo) * $w / ($hi - $lo); 1455 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1319 1456
1320 $w -= $page; 1457 $w -= $page;
1321 $page &= ~1; 1458 $page &= ~1;
1322 glTranslate $page * 0.5, 0, 0; 1459 glTranslate $page * 0.5, 0, 0;
1460 $page ||= 2;
1323 1461
1324 glColor @$fg;
1325 glBegin GL_LINES;
1326 glVertex 0, 0; glVertex 0, $h;
1327 glVertex $w - 1, 0; glVertex $w - 1, $h;
1328 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1329 glEnd;
1330
1331 my $knob_a = $value - $page * 0.5; 1462 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1332 my $knob_b = $value + $page * 0.5; 1463 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1333 1464
1334 glBegin GL_QUADS; 1465 glEnable GL_BLEND;
1335 glColor @$fg; 1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1336 glVertex $knob_a, 0; 1467 glEnable GL_TEXTURE_2D;
1337 glVertex $knob_a, $h; 1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1338 glVertex $knob_b, $h;
1339 glVertex $knob_b, 0;
1340 1469
1341 if ($knob_a < $knob_b - 2) { 1470 # draw background
1342 glColor @$bg; 1471 $tex[1]->draw_quad (0, 0, $w, $h);
1343 glVertex $knob_a + 1, 1; 1472
1344 glVertex $knob_a + 1, $h - 1; 1473 # draw handle
1345 glVertex $knob_b - 1, $h - 1; 1474 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1346 glVertex $knob_b - 1, 1; 1475
1476 glDisable GL_BLEND;
1477 glDisable GL_TEXTURE_2D;
1478}
1479
1480#############################################################################
1481
1482package CFClient::UI::TextView;
1483
1484our @ISA = CFClient::UI::HBox::;
1485
1486use SDL::OpenGL;
1487
1488sub new {
1489 my $class = shift;
1490
1491 my $self = $class->SUPER::new (
1492 req_w => $::WIDTH / 6,
1493 req_h => $::HEIGHT / 6,
1494 fontsize => $::FONTSIZE,
1495 @_,
1496
1497 layout => (new CFClient::Layout),
1498 par => [],
1499 height => 0,
1500 children => [
1501 (new CFClient::UI::Empty expand => 1),
1502 (new CFClient::UI::Slider vertical => 1),
1503 ],
1504 );
1505
1506 $self->{children}[1]->connect (changed => sub {
1507 $self->update;
1508 });
1509
1510 $self
1511}
1512
1513sub set_fontsize {
1514 my ($self, $fontsize) = @_;
1515
1516 $self->{fontsize} = $fontsize;
1517 $self->reflow;
1518}
1519
1520sub text_height {
1521 my ($self, $text) = @_;
1522
1523 my $layout = $self->{layout};
1524
1525 $layout->set_height ($self->{fontsize});
1526 $layout->set_width ($self->{w});
1527 $layout->set_text ($text);
1347 } 1528
1348 glEnd; 1529 ($layout->size)[1]
1530}
1531
1532sub reflow {
1533 my ($self) = @_;
1534
1535 $self->{need_reflow}++;
1536 $self->update;
1537}
1538
1539sub size_request {
1540 my ($self) = @_;
1541
1542 ($self->{req_w}, $self->{req_h})
1543}
1544
1545sub size_allocate {
1546 my ($self, $x, $y, $w, $h) = @_;
1547
1548 $self->SUPER::size_allocate ($x, $y, $w, $h);
1549
1550 $self->{layout}->set_height ($self->{fontsize});
1551 $self->{layout}->set_width ($self->{w});
1552
1553 $self->reflow;
1554}
1555
1556sub add_paragraph {
1557 my ($self, $color, $text) = @_;
1558
1559 #TODO: intelligently "reformat" paragraph
1560
1561 my $height = $self->text_height ($text);
1562
1563 $self->{height} += $height;
1564
1565 push @{$self->{par}}, [$height, $color, $text];
1566
1567 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1568 $self->{children}[1]->update;
1569}
1570
1571sub update {
1572 my ($self) = @_;
1573
1574 $self->SUPER::update;
1575
1576 return unless $self->{h} > 0;
1577
1578 delete $self->{texture};
1579
1580 $TOPLEVEL->on_refresh ($self, sub {
1581 if (delete $self->{need_reflow}) {
1582 my $height = 0;
1583
1584 $height += $_->[0] = $self->text_height ($_->[2])
1585 for @{$self->{par}};
1586
1587 $self->{height} = $height;
1588
1589 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1590
1591 delete $self->{texture};
1592 }
1593
1594 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1595 glClearColor 0, 0, 0, 1;
1596 glClear GL_COLOR_BUFFER_BIT;
1597
1598 glEnable GL_BLEND;
1599 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1600 glEnable GL_TEXTURE_2D;
1601 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1602
1603 my $top = int $self->{children}[1]{range}[0];
1604
1605 my $y0 = $top;
1606 my $y1 = $top + $self->{h};
1607
1608 my $y = 0;
1609
1610 my $layout = $self->{layout};
1611
1612 for my $par (@{$self->{par}}) {
1613 my $h = $par->[0];
1614
1615 if ($y0 < $y + $h && $y < $y1) {
1616 $layout->set_text ($par->[2]);
1617
1618 glColor @{ $par->[1] };
1619 my ($W, $H) = $layout->size;
1620 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1621 }
1622
1623 $y += $h;
1624 }
1625
1626 glDisable GL_TEXTURE_2D;
1627 glDisable GL_BLEND;
1628 };
1629 });
1630}
1631
1632sub _draw {
1633 my ($self) = @_;
1634
1635 if ($self->{texture}) {
1636 glEnable GL_TEXTURE_2D;
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1638 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1639 glDisable GL_TEXTURE_2D;
1640 }
1641
1642 $self->{children}[1]->draw;
1643
1349} 1644}
1350 1645
1351############################################################################# 1646#############################################################################
1352 1647
1353package CFClient::UI::MapWidget; 1648package CFClient::UI::MapWidget;
1363 1658
1364sub new { 1659sub new {
1365 my $class = shift; 1660 my $class = shift;
1366 1661
1367 $class->SUPER::new ( 1662 $class->SUPER::new (
1368 z => -1, 1663 z => -1,
1664 can_focus => 1,
1369 list => (glGenLists 1), 1665 list => (glGenLists 1),
1370 @_ 1666 @_
1371 ) 1667 )
1372} 1668}
1373 1669
1374sub key_down { 1670sub key_down {
1375 print "MAPKEYDOWN\n"; 1671 print "MAPKEYDOWN\n";
1376} 1672}
1377 1673
1378sub key_up { 1674sub key_up {
1675}
1676
1677sub button_down {
1678 my ($self, $ev, $x, $y) = @_;
1679
1680 $self->focus_in;
1681
1682 if ($ev->button == 2) {
1683 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1684 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1685
1686 $self->{motion} = sub {
1687 my ($ev, $x, $y) = @_;
1688
1689 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1690
1691 $::CFG->{map_shift_x} = $bw + $x - $ox;
1692 $::CFG->{map_shift_y} = $bh + $y - $oy;
1693
1694 $self->update;
1695 };
1696 }
1697}
1698
1699sub button_up {
1700 my ($self, $ev, $x, $y) = @_;
1701
1702 delete $self->{motion};
1703}
1704
1705sub mouse_motion {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 $self->{motion}->($ev, $x, $y) if $self->{motion};
1379} 1709}
1380 1710
1381sub size_request { 1711sub size_request {
1382 ( 1712 (
1383 1 + 32 * int $::WIDTH / 32, 1713 1 + 32 * int $::WIDTH / 32,
1396 my ($self) = @_; 1726 my ($self) = @_;
1397 1727
1398 if (delete $self->{need_update}) { 1728 if (delete $self->{need_update}) {
1399 glNewList $self->{list}, GL_COMPILE; 1729 glNewList $self->{list}, GL_COMPILE;
1400 1730
1401 my $mx = $::CONN->{mapx}; 1731 if ($::MAP) {
1402 my $my = $::CONN->{mapy};
1403
1404 my $map = $::CONN->{map};
1405
1406 my ($xofs, $yofs);
1407
1408 my $sw = 1 + int $::WIDTH / 32; 1732 my $sw = int $::WIDTH / 32;
1409 my $sh = 1 + int $::HEIGHT / 32; 1733 my $sh = int $::HEIGHT / 32;
1410 1734
1411 if ($::CONN->{mapw} > $sw) { 1735 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1412 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1736 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1413 } else { 1737
1414 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1738 glTranslate $sx0 - 32, $sy0 - 32, 0;
1739
1740 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1741
1742 if ($::CFG->{fow_enable}) {
1743 if ($::CFG->{fow_smooth}) { # smooth fog of war
1744 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1745 glConvolutionFilter2D
1746 GL_CONVOLUTION_2D,
1747 GL_ALPHA,
1748 3, 3,
1749 GL_ALPHA, GL_FLOAT,
1750 pack "f*",
1751 0.1, 0.1, 0.1,
1752 0.1, 0.2, 0.1,
1753 0.1, 0.1, 0.1,
1754 ;
1755 glEnable GL_CONVOLUTION_2D;
1756 }
1757
1758 my $tex = new CFClient::Texture
1759 w => $w,
1760 h => $h,
1761 data => $data,
1762 internalformat => GL_ALPHA,
1763 format => GL_ALPHA;
1764
1765 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1766
1767 glEnable GL_BLEND;
1768 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1769 glEnable GL_TEXTURE_2D;
1770 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1771
1772 glColor +($::CFG->{fow_intensity}) x 3, 1;
1773 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1774
1775 glDisable GL_TEXTURE_2D;
1776 glDisable GL_BLEND;
1777 }
1778
1779 # HACK BEGIN
1780 {
1781 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1782 my ($w, $h) = (250, 250);
1783
1784 glEnable GL_BLEND;
1785 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1786 glEnable GL_TEXTURE_2D;
1787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1788
1789 CFClient::Texture->new (
1790 w => $w,
1791 h => $h,
1792 data => $::MAP->mapmap ($w, $h),
1793 type => GL_UNSIGNED_INT_8_8_8_8_REV
1794 )->draw_quad (100, 100);
1795
1796 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND;
1798 }
1799 # HACK END
1415 } 1800 }
1416 1801
1417 if ($::CONN->{maph} > $sh) {
1418 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1419 } else {
1420 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1421 }
1422
1423 glEnable GL_TEXTURE_2D;
1424 glEnable GL_BLEND;
1425 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1426 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1427
1428 my $sw4 = ($sw + 3) & ~3;
1429 my $darkness = "\x00" x ($sw4 * $sh);
1430
1431 for my $x (0 .. $sw - 1) {
1432 my $row = $map->[$x + $xofs];
1433 for my $y (0 .. $sh - 1) {
1434
1435 my $cell = $row->[$y + $yofs]
1436 or next;
1437
1438 my $dark = $cell->[0];
1439 if ($dark < 0) {
1440 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1441 } else {
1442 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1443 }
1444
1445 for my $num (grep $_, @$cell[1,2,3]) {
1446 my $tex = $::CONN->{face}[$num]{texture} || next;
1447
1448 my ($w, $h) = @$tex{qw(w h)};
1449
1450 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1451 }
1452 }
1453 }
1454
1455# if (1) { # higher quality darkness
1456# $lighting =~ s/(.)/$1$1$1/gs;
1457# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1458#
1459# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1460#
1461# $lighting = $pb->get_pixels;
1462# $lighting =~ s/(.)../$1/gs;
1463# }
1464
1465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466
1467 $darkness = new CFClient::Texture
1468 w => $sw4,
1469 h => $sh,
1470 data => $darkness,
1471 internalformat => GL_ALPHA,
1472 format => GL_ALPHA;
1473
1474 glColor 0.45, 0.45, 0.45, 1;
1475 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1476
1477 glDisable GL_TEXTURE_2D;
1478 glDisable GL_BLEND;
1479
1480 glEndList; 1802 glEndList;
1481 } 1803 }
1482 1804
1805 glPushMatrix;
1483 glCallList $self->{list}; 1806 glCallList $self->{list};
1807 glPopMatrix;
1808
1809 if ($FOCUS != $self) {
1810 glColor 64/255, 64/255, 64/255;
1811 glLogicOp GL_AND;
1812 glEnable GL_COLOR_LOGIC_OP;
1813 glBegin GL_QUADS;
1814 glVertex 0, 0;
1815 glVertex 0, $::HEIGHT;
1816 glVertex $::WIDTH, $::HEIGHT;
1817 glVertex $::WIDTH, 0;
1818 glEnd;
1819 glDisable GL_COLOR_LOGIC_OP;
1820 }
1484} 1821}
1485 1822
1486my %DIR = ( 1823my %DIR = (
1487 SDLK_KP8, [1, "north"], 1824 SDLK_KP8, [1, "north"],
1488 SDLK_KP9, [2, "northeast"], 1825 SDLK_KP9, [2, "northeast"],
1504 1841
1505 my $mod = $ev->key_mod; 1842 my $mod = $ev->key_mod;
1506 my $sym = $ev->key_sym; 1843 my $sym = $ev->key_sym;
1507 1844
1508 if ($sym == SDLK_KP5) { 1845 if ($sym == SDLK_KP5) {
1509 $::CONN->send ("command stay fire"); 1846 $::CONN->user_send ("command stay fire");
1847 } elsif ($sym == SDLK_a) {
1848 $::CONN->user_send ("command apply");
1849 } elsif ($sym == SDLK_QUOTE) {
1850 $self->emit ('activate_console');
1851 } elsif ($sym == SDLK_SLASH) {
1852 $self->emit ('activate_console' => '/');
1510 } elsif (exists $DIR{$sym}) { 1853 } elsif (exists $DIR{$sym}) {
1511 if ($mod & KMOD_SHIFT) { 1854 if ($mod & KMOD_SHIFT) {
1512 $self->{shft}++; 1855 $self->{shft}++;
1513 $::CONN->send ("command fire $DIR{$sym}[0]"); 1856 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1514 } elsif ($mod & KMOD_CTRL) { 1857 } elsif ($mod & KMOD_CTRL) {
1515 $self->{ctrl}++; 1858 $self->{ctrl}++;
1516 $::CONN->send ("command run $DIR{$sym}[0]"); 1859 $::CONN->user_send ("command run $DIR{$sym}[0]");
1517 } else { 1860 } else {
1518 $::CONN->send ("command $DIR{$sym}[1]"); 1861 $::CONN->user_send ("command $DIR{$sym}[1]");
1519 } 1862 }
1520 } 1863 }
1521} 1864}
1522 1865
1523sub key_up { 1866sub key_up {
1525 1868
1526 my $mod = $ev->key_mod; 1869 my $mod = $ev->key_mod;
1527 my $sym = $ev->key_sym; 1870 my $sym = $ev->key_sym;
1528 1871
1529 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1872 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1530 $::CONN->send ("command fire_stop"); 1873 $::CONN->user_send ("command fire_stop");
1531 } 1874 }
1532 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1875 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1533 $::CONN->send ("command run_stop"); 1876 $::CONN->user_send ("command run_stop");
1534 } 1877 }
1535} 1878}
1536 1879
1537############################################################################# 1880#############################################################################
1538 1881
1576 glPopMatrix; 1919 glPopMatrix;
1577} 1920}
1578 1921
1579############################################################################# 1922#############################################################################
1580 1923
1924package CFClient::UI::Flopper;
1925
1926our @ISA = CFClient::UI::Button::;
1927
1928sub new {
1929 my $class = shift;
1930
1931 my $self = $class->SUPER::new (
1932 state => 0,
1933 connect_activate => \&toggle_flopper,
1934 @_
1935 );
1936
1937 if ($self->{state}) {
1938 $self->{state} = 0;
1939 $self->toggle_flopper;
1940 }
1941
1942 $self
1943}
1944
1945sub toggle_flopper {
1946 my ($self) = @_;
1947
1948 # TODO: use animation
1949 if ($self->{state} = !$self->{state}) {
1950 $CFClient::UI::TOPLEVEL->add ($self->{other});
1951 $self->{other}->move (
1952 ($::WIDTH - $self->{other}{w}) * 0.5,
1953 ($::HEIGHT - $self->{other}{h}) * 0.5,
1954 );
1955 } else {
1956 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1957 }
1958}
1959
1960#############################################################################
1961
1581package CFClient::UI::Toplevel; 1962package CFClient::UI::Toplevel;
1582 1963
1583our @ISA = CFClient::UI::Container::; 1964our @ISA = CFClient::UI::Container::;
1965
1966use SDL::OpenGL;
1584 1967
1585sub size_request { 1968sub size_request {
1586 ($::WIDTH, $::HEIGHT) 1969 ($::WIDTH, $::HEIGHT)
1587} 1970}
1588 1971
1614 $self->SUPER::add ($widget); 1997 $self->SUPER::add ($widget);
1615 1998
1616 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 1999 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1617} 2000}
1618 2001
2002sub on_refresh {
2003 my ($self, $id, $cb) = @_;
2004
2005 $self->{refresh_hook}{$id} = $cb;
2006}
2007
1619sub draw { 2008sub draw {
1620 my ($self) = @_; 2009 my ($self) = @_;
1621 2010
2011 while (my $rcb = delete $self->{refresh_hook}) {
2012 $_->() for values %$rcb;
2013 }
2014
2015 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2016 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2017 glClear GL_COLOR_BUFFER_BIT;
2018
2019 glMatrixMode GL_PROJECTION;
2020 glLoadIdentity;
2021 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2022 glMatrixMode GL_MODELVIEW;
2023 glLoadIdentity;
2024
1622 $self->_draw; 2025 $self->_draw;
1623} 2026}
1624 2027
1625############################################################################# 2028#############################################################################
1626 2029

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines