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.86 by root, Wed Apr 12 15:35:54 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}
… …
200 my ($self) = @_; 208 my ($self) = @_;
201 209
202 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
203} 211}
204 212
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 { 213sub find_widget {
217 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
218 215
219 return $self 216 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 217 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 219
223 () 220 ()
224} 221}
225 222
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 223sub set_parent {
229 my ($self, $par) = @_; 224 my ($self, $par) = @_;
230 225
231 $self->{parent} = $par; 226 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
276 271
277 # range [value, low, high, page] 272 # range [value, low, high, page]
278 273
279 $class->SUPER::new ( 274 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2], 275 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 276 active_bg => [1, 1, 1, 0.5],
282 @_ 277 @_
283 ) 278 )
284} 279}
285 280
286sub _draw { 281sub _draw {
… …
330 325
331 $self 326 $self
332} 327}
333 328
334sub add { 329sub add {
335 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
336 331
337 $chld->{expand} = $expand;
338 $chld->set_parent ($self); 332 $chld->set_parent ($self);
339 333
340 $self->{children} = [ 334 $self->{children} = [
341 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
342 @{$self->{children}}, $chld 336 @{$self->{children}}, $chld
… …
538 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
539 533
540sub size_request { 534sub size_request {
541 my ($self) = @_; 535 my ($self) = @_;
542 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
543 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
544 540
545 $h += $tex[1]->{h}; 541 $h += $tex[1]->{h};
546 $h += $tex[4]->{h}; 542 $h += $tex[4]->{h};
547 $w += $tex[2]->{w}; 543 $w += $tex[2]->{w};
… …
553sub size_allocate { 549sub size_allocate {
554 my ($self, $x, $y, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
555 551
556 $self->_size_allocate ($x, $y, $w, $h) or return; 552 $self->_size_allocate ($x, $y, $w, $h) or return;
557 553
558 $h -= $tex[1]->{h}; 554 $h -= $tex[1]{h};
559 $h -= $tex[4]->{h}; 555 $h -= $tex[4]{h};
560 $w -= $tex[2]->{w}; 556 $w -= $tex[2]{w};
561 $w -= $tex[3]->{w}; 557 $w -= $tex[3]{w};
562 558
563 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
564 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
565 561
566 my $child = $self->child; 562 my $child = $self->child;
567 563
568 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); 564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
569} 613}
570 614
571sub _draw { 615sub _draw {
572 my ($self) = @_; 616 my ($self) = @_;
573 617
… …
593 637
594 my $bg = $tex[0]; 638 my $bg = $tex[0];
595 639
596 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 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 642
601 my $rep_x = $cw / $bg->{w}; 643 my $rep_x = $cw / $bg->{w};
602 my $rep_y = $ch / $bg->{h}; 644 my $rep_y = $ch / $bg->{h};
603 645
604 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
… …
617our @ISA = CFClient::UI::Base::; 659our @ISA = CFClient::UI::Base::;
618 660
619use List::Util qw(max sum); 661use List::Util qw(max sum);
620 662
621use SDL::OpenGL; 663use SDL::OpenGL;
664
665sub new {
666 my $class = shift;
667
668 $class->SUPER::new (
669 col_expand => [],
670 @_
671 )
672}
622 673
623sub add { 674sub add {
624 my ($self, $x, $y, $chld) = @_; 675 my ($self, $x, $y, $chld) = @_;
625 676
626 $self->{children}[$y][$x] = $chld; 677 $self->{children}[$y][$x] = $chld;
… …
656 my ($self) = @_; 707 my ($self) = @_;
657 708
658 my ($ws, $hs) = $self->get_wh; 709 my ($ws, $hs) = $self->get_wh;
659 710
660 ( 711 (
661 (List::Util::sum @$ws), 712 (sum @$ws),
662 (List::Util::sum @$hs), 713 (sum @$hs),
663 ) 714 )
664} 715}
665 716
666sub size_allocate { 717sub size_allocate {
667 my ($self, $x, $y, $w, $h) = @_; 718 my ($self, $x, $y, $w, $h) = @_;
668 719
669 $self->_size_allocate ($x, $y, $w, $h) or return; 720 $self->_size_allocate ($x, $y, $w, $h) or return;
670 721
671 my ($ws, $hs) = $self->get_wh; 722 my ($ws, $hs) = $self->get_wh;
672 723
673 my $req_w = List::Util::sum @$ws; 724 my $req_w = sum @$ws;
674 my $req_h = List::Util::sum @$hs; 725 my $req_h = sum @$hs;
726
727 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1;
675 731
676 # linearly scale sizes 732 # linearly scale sizes
677 $_ *= $req_w / $w for @$ws; 733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
678 $_ *= $req_h / $h for @$hs; 734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
679 735
680 my $y; 736 my $y;
681 737
682 for my $r (0 .. $#{$self->{children}}) { 738 for my $r (0 .. $#{$self->{children}}) {
683 my $row = $self->{children}[$r] 739 my $row = $self->{children}[$r]
… …
685 741
686 my $x = 0; 742 my $x = 0;
687 my $row_h = $hs->[$r]; 743 my $row_h = $hs->[$r];
688 744
689 for my $c (0 .. $#$row) { 745 for my $c (0 .. $#$row) {
690 my $widget = $row->[$c]
691 or next;
692
693 my $col_w = $ws->[$c]; 746 my $col_w = $ws->[$c];
694 747
748 if (my $widget = $row->[$c]) {
695 $widget->size_allocate ($x, $y, $col_w, $row_h); 749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
696 751
697 $x += $col_w; 752 $x += $col_w;
698 } 753 }
699 754
700 $y += $row_h; 755 $y += $row_h;
… …
746} 801}
747 802
748sub size_allocate { 803sub size_allocate {
749 my ($self, $x, $y, $w, $h) = @_; 804 my ($self, $x, $y, $w, $h) = @_;
750 805
751 $self->_size_allocate ($x, $y, $w, $h) or return; 806 $self->_size_allocate ($x, $y, $w, $h);
752
753 return unless $self->{w};
754 807
755 ($h, $w) = ($w, $h); 808 ($h, $w) = ($w, $h);
756 809
757 my $children = $self->{children}; 810 my $children = $self->{children};
758 811
… …
760 813
761 my $req_h = List::Util::sum @h; 814 my $req_h = List::Util::sum @h;
762 815
763 if ($req_h > $h) { 816 if ($req_h > $h) {
764 # ah well, not enough space 817 # ah well, not enough space
765 $_ = $h[$_] * $h / $req_h for @h; 818 $_ *= $h / $req_h for @h;
766 } else { 819 } else {
767 my @exp = grep $_->{expand}, @$children; 820 my $exp = List::Util::sum map $_->{expand}, @$children;
768 @exp = @$children unless @exp; 821 $exp ||= 1;
769 822
770 my %exp = map +($_ => 1), @exp;
771
772 for (0 .. $#$children) { 823 for (0 .. $#$children) {
773 my $child = $children->[$_]; 824 my $child = $children->[$_];
774 825
775 my $alloc_h = $h[$_]; 826 my $alloc_h = $h[$_];
776 $alloc_h += ($h - $req_h) / @exp if $exp{$child}; 827 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
777 $h[$_] = $alloc_h; 828 $h[$_] = $alloc_h;
778 } 829 }
779 } 830 }
780 831
781 my $y = 0; 832 my $y = 0;
… …
808} 859}
809 860
810sub size_allocate { 861sub size_allocate {
811 my ($self, $x, $y, $w, $h) = @_; 862 my ($self, $x, $y, $w, $h) = @_;
812 863
813 $self->_size_allocate ($x, $y, $w, $h) or return; 864 $self->_size_allocate ($x, $y, $w, $h);
814
815 return unless $self->{h};
816 865
817 my $children = $self->{children}; 866 my $children = $self->{children};
818 867
819 my @h = map +($_->size_request)[1], @$children; 868 my @h = map +($_->size_request)[1], @$children;
820 869
821 my $req_h = List::Util::sum @h; 870 my $req_h = List::Util::sum @h;
822 871
823 if ($req_h > $h) { 872 if ($req_h > $h) {
824 # ah well, not enough space 873 # ah well, not enough space
825 $_ = $h[$_] * $h / $req_h for @h; 874 $_ *= $h / $req_h for @h;
826 } else { 875 } else {
827 my @exp = grep $_->{expand}, @$children; 876 my $exp = List::Util::sum map $_->{expand}, @$children;
828 @exp = @$children unless @exp; 877 $exp ||= 1;
829 878
830 my %exp = map +($_ => 1), @exp;
831
832 for (0 .. $#$children) { 879 for (0 .. $#$children) {
833 my $child = $children->[$_]; 880 my $child = $children->[$_];
834 881
835 my $alloc_h = $h[$_]; 882 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
836 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
837 $h[$_] = $alloc_h;
838 } 883 }
839 } 884 }
840 885
841 my $y = 0; 886 my $y = 0;
842 for (0 .. $#$children) { 887 for (0 .. $#$children) {
… …
889 934
890 $self->{text} = $text; 935 $self->{text} = $text;
891 $self->{layout}->set_markup ($text); 936 $self->{layout}->set_markup ($text);
892 937
893 delete $self->{texture}; 938 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
894 $self->update; 940 $self->update;
895} 941}
896 942
897sub get_text { 943sub get_text {
898 my ($self, $text) = @_; 944 my ($self, $text) = @_;
… …
931sub _draw { 977sub _draw {
932 my ($self) = @_; 978 my ($self) = @_;
933 979
934 my $tex = $self->{texture} ||= do { 980 my $tex = $self->{texture} ||= do {
935 $self->{layout}->set_width ($self->{w}); 981 $self->{layout}->set_width ($self->{w});
982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
936 new_from_layout CFClient::Texture $self->{layout} 983 new_from_layout CFClient::Texture $self->{layout}
937 }; 984 };
938 985
939 glEnable GL_BLEND; 986 glEnable GL_BLEND;
940 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
946 my $x = 993 my $x =
947 $self->{align} < 0 ? $self->{padding} 994 $self->{align} < 0 ? $self->{padding}
948 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949 : ($self->{w} - $tex->{w}) * 0.5; 996 : ($self->{w} - $tex->{w}) * 0.5;
950 997
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
951 $tex->draw_quad ($x, 0); 999 $tex->draw_quad (0, 0);
952 1000
953 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
954 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
955} 1003}
956 1004
… …
967 my $class = shift; 1015 my $class = shift;
968 1016
969 $class->SUPER::new ( 1017 $class->SUPER::new (
970 fg => [1, 1, 1], 1018 fg => [1, 1, 1],
971 bg => [0, 0, 0, 0.2], 1019 bg => [0, 0, 0, 0.2],
972 active_bg => [1, 1, 1], 1020 active_bg => [1, 1, 1, 0.5],
973 active_fg => [0, 0, 0], 1021 active_fg => [0, 0, 0],
974 @_ 1022 @_
975 ) 1023 )
976} 1024}
977 1025
… …
980 1028
981 $self->{last_activity} = $::NOW; 1029 $self->{last_activity} = $::NOW;
982 1030
983 $self->{text} = $text; 1031 $self->{text} = $text;
984 $self->{layout}->set_width ($self->{w}); 1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
985 1034
986 $text =~ s/./*/g if $self->{hidden}; 1035 $text =~ s/./*/g if $self->{hidden};
987 1036
988 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1037 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
989 1038
… …
1110 } 1159 }
1111} 1160}
1112 1161
1113############################################################################# 1162#############################################################################
1114 1163
1164package CFClient::UI::Button;
1165
1166our @ISA = CFClient::UI::Label::;
1167
1168use SDL;
1169use SDL::OpenGL;
1170
1171my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png);
1174
1175sub new {
1176 my $class = shift;
1177
1178 $class->SUPER::new (
1179 padding => 4,
1180 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5],
1184# border_fg => [1, 1, 0],
1185 @_
1186 )
1187}
1188
1189sub button_up {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($x >= 0 && $x < $self->{w}
1193 && $y >= 0 && $y < $self->{h}) {
1194 $self->emit ("activate");
1195 }
1196}
1197
1198sub _draw {
1199 my ($self) = @_;
1200
1201 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
1203
1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207
1208 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg};
1210 }
1211
1212 glBindTexture GL_TEXTURE_2D, $tex->{name};
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1214
1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1216
1217 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND;
1219
1220 $self->SUPER::_draw;
1221}
1222
1223#############################################################################
1224
1225package CFClient::UI::CheckBox;
1226
1227our @ISA = CFClient::UI::DrawBG::;
1228
1229use SDL;
1230use SDL::OpenGL;
1231
1232my @tex =
1233 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1234 qw(b1_button_active.png);
1235
1236sub new {
1237 my $class = shift;
1238
1239 $class->SUPER::new (
1240 padding => 4,
1241 fg => [1, 1, 1],
1242 active_fg => [1, 1, 0],
1243 state => 0,
1244 @_
1245 )
1246}
1247
1248sub button_down {
1249 my ($self, $ev, $x, $y) = @_;
1250
1251 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1252 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1253 $self->{state} = !$self->{state};
1254 $self->emit ("changed");
1255 }
1256}
1257
1258sub _draw {
1259 my ($self) = @_;
1260
1261 local $self->{fg} = $self->{fg};
1262 my $tex = $tex[0];
1263
1264 glEnable GL_BLEND;
1265 glEnable GL_TEXTURE_2D;
1266 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1267
1268 if ($GRAB == $self) {
1269 $self->{fg} = $self->{active_fg};
1270 }
1271
1272 glBindTexture GL_TEXTURE_2D, $tex->{name};
1273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1274
1275 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1276
1277 glDisable GL_TEXTURE_2D;
1278 glDisable GL_BLEND;
1279
1280 $self->SUPER::_draw;
1281}
1282
1283#############################################################################
1284
1115package CFClient::UI::Slider; 1285package CFClient::UI::Slider;
1116 1286
1117use strict; 1287use strict;
1118 1288
1119use SDL::OpenGL; 1289use SDL::OpenGL;
… …
1197 $value = int +($value - $lo) * $w / ($hi - $lo); 1367 $value = int +($value - $lo) * $w / ($hi - $lo);
1198 1368
1199 $w -= $page; 1369 $w -= $page;
1200 $page &= ~1; 1370 $page &= ~1;
1201 glTranslate $page * 0.5, 0, 0; 1371 glTranslate $page * 0.5, 0, 0;
1372 $page ||= 2;
1202 1373
1203 glColor @$fg; 1374 glColor @$fg;
1204 glBegin GL_LINES; 1375 glBegin GL_LINES;
1205 glVertex 0, 0; glVertex 0, $h; 1376 glVertex 0, 0; glVertex 0, $h;
1206 glVertex $w - 1, 0; glVertex $w - 1, $h; 1377 glVertex $w - 1, 0; glVertex $w - 1, $h;
… …
1257sub key_up { 1428sub key_up {
1258} 1429}
1259 1430
1260sub size_request { 1431sub size_request {
1261 ( 1432 (
1262 1 + int $::WIDTH / 32, 1433 1 + 32 * int $::WIDTH / 32,
1263 1 + int $::HEIGHT / 32, 1434 1 + 32 * int $::HEIGHT / 32,
1264 ) 1435 )
1265} 1436}
1266 1437
1267sub update { 1438sub update {
1268 my ($self) = @_; 1439 my ($self) = @_;
1269 1440
1270 $self->{need_update} = 1; 1441 $self->{need_update} = 1;
1271 $self->SUPER::update; 1442 $self->SUPER::update;
1272} 1443}
1273 1444
1274sub _draw { 1445sub draw {
1275 my ($self) = @_; 1446 my ($self) = @_;
1276 1447
1277 if (delete $self->{need_update}) { 1448 if (delete $self->{need_update}) {
1278 glNewList $self->{list}, GL_COMPILE; 1449 glNewList $self->{list}, GL_COMPILE;
1279 1450
… …
1384 my $mod = $ev->key_mod; 1555 my $mod = $ev->key_mod;
1385 my $sym = $ev->key_sym; 1556 my $sym = $ev->key_sym;
1386 1557
1387 if ($sym == SDLK_KP5) { 1558 if ($sym == SDLK_KP5) {
1388 $::CONN->send ("command stay fire"); 1559 $::CONN->send ("command stay fire");
1560 } elsif ($sym == SDLK_a) {
1561 $::CONN->send ("command apply");
1389 } elsif (exists $DIR{$sym}) { 1562 } elsif (exists $DIR{$sym}) {
1390 if ($mod & KMOD_SHIFT) { 1563 if ($mod & KMOD_SHIFT) {
1391 $self->{shft}++; 1564 $self->{shft}++;
1392 $::CONN->send ("command fire $DIR{$sym}[0]"); 1565 $::CONN->send ("command fire $DIR{$sym}[0]");
1393 } elsif ($mod & KMOD_CTRL) { 1566 } elsif ($mod & KMOD_CTRL) {

Diff Legend

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