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.104 by elmex, Fri Apr 14 14:02:52 2006 UTC

… …
79use SDL::OpenGL; 79use SDL::OpenGL;
80 80
81sub new { 81sub new {
82 my $class = shift; 82 my $class = shift;
83 83
84 bless { 84 my $self = bless {
85 x => 0, 85 x => 0,
86 y => 0, 86 y => 0,
87 z => 0, 87 z => 0,
88 w => -1, 88 w => -1,
89 h => -1, 89 h => -1,
90 @_ 90 @_
91 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
92} 100}
93 101
94sub move { 102sub move {
95 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 104 $self->{x} = $x;
… …
125 my ($self, $x, $y, $w, $h) = @_; 133 my ($self, $x, $y, $w, $h) = @_;
126 134
127 $self->_size_allocate ($x, $y, $w, $h); 135 $self->_size_allocate ($x, $y, $w, $h);
128} 136}
129 137
130# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
131sub translate { 139sub translate {
132 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
133 141
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
135} 143}
136 144
137sub focus_in { 145sub focus_in {
138 my ($self) = @_; 146 my ($self) = @_;
139 147
140 return if $FOCUS == $self; 148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
141 150
142 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
143 $focus->update if $focus; 152 $focus->update if $focus;
144 $FOCUS->update; 153 $FOCUS->update;
145} 154}
… …
178 glPushMatrix; 187 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 189 $self->_draw;
181 glPopMatrix; 190 glPopMatrix;
182 191
183 if ($self == $HOVER) { 192 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 193 my ($x, $y) = @$self{qw(x y)};
185 194
186 glColor 0, 0, 1, 0.2; 195 glColor 0, 0, 1, 0.2;
187 glEnable GL_BLEND; 196 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
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 {
… …
521 530
522my @tex = 531my @tex =
523 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 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); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
525 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
526sub size_request { 548sub size_request {
527 my ($self) = @_; 549 my ($self) = @_;
528 550
529 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
530 552
531 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
532 554
533 $h += $tex[1]->{h}; 555 (
534 $h += $tex[4]->{h}; 556 $w + $self->{border} * 2,
535 $w += $tex[2]->{w}; 557 $h + $self->{border} * 2,
536 $w += $tex[3]->{w}; 558 )
537
538 ($w, $h)
539} 559}
540 560
541sub size_allocate { 561sub size_allocate {
542 my ($self, $x, $y, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
543 563
544 $self->_size_allocate ($x, $y, $w, $h) or return; 564 $self->_size_allocate ($x, $y, $w, $h) or return;
545 565
546 $h -= $tex[1]{h}; 566 $h -= List::Util::max 0, $self->{border} * 2;
547 $h -= $tex[4]{h}; 567 $w -= List::Util::max 0, $self->{border} * 2;
548 $w -= $tex[2]{w};
549 $w -= $tex[3]{w};
550 568
551 $h = $h < 0 ? 0 : $h; 569 $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} 570}
558 571
559sub button_down { 572sub button_down {
560 my ($self, $ev, $x, $y) = @_; 573 my ($self, $ev, $x, $y) = @_;
561 574
562 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
563 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
564 577
565 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
566 my ($bw, $bh) = ($self->{w}, $self->{h}); 579 my ($bw, $bh) = ($self->{w}, $self->{h});
567 580
568 $self->{motion} = sub { 581 $self->{motion} = sub {
… …
574 $self->{user_h} = $bh + $y - $oy; 587 $self->{user_h} = $bh + $y - $oy;
575 $self->update; 588 $self->update;
576 }; 589 };
577 590
578 } elsif ($x >= 0 && $x < $self->{w} 591 } elsif ($x >= 0 && $x < $self->{w}
579 && $y >= 0 && $y < $tex[1]{h}) { 592 && $y >= 0 && $y < $self->{border}) {
580 593
581 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
582 my ($bx, $by) = ($self->{x}, $self->{y}); 595 my ($bx, $by) = ($self->{x}, $self->{y});
583 596
584 $self->{motion} = sub { 597 $self->{motion} = sub {
… …
605} 618}
606 619
607sub _draw { 620sub _draw {
608 my ($self) = @_; 621 my ($self) = @_;
609 622
610 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
611 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
612 625
613 glEnable GL_BLEND; 626 glEnable GL_BLEND;
614 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
615 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
617 630
618 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
619 $top->draw_quad (0, 0, $w, $top->{h}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
620 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
621 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
622 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 635 $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 636
630 my $bg = $tex[0]; 637 my $bg = $tex[0];
631 638
632 glBindTexture GL_TEXTURE_2D, $bg->{name}; 639 # 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}; 640 my $rep_x = $cw / $bg->{w};
638 my $rep_y = $ch / $bg->{h}; 641 my $rep_y = $ch / $bg->{h};
639 642
643 glColor @{ $self->{bg} };
644
645 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1;
640 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
641 649
642 glDisable GL_TEXTURE_2D; 650 glDisable GL_TEXTURE_2D;
643 glDisable GL_BLEND; 651 glDisable GL_BLEND;
644 652
645 $self->child->draw; 653 $self->child->draw;
646
647} 654}
648 655
649############################################################################# 656#############################################################################
650 657
651package CFClient::UI::Table; 658package CFClient::UI::Table;
… …
735 742
736 my $x = 0; 743 my $x = 0;
737 my $row_h = $hs->[$r]; 744 my $row_h = $hs->[$r];
738 745
739 for my $c (0 .. $#$row) { 746 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 747 my $col_w = $ws->[$c];
744 748
749 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 750 $widget->size_allocate ($x, $y, $col_w, $row_h);
751 }
746 752
747 $x += $col_w; 753 $x += $col_w;
748 } 754 }
749 755
750 $y += $row_h; 756 $y += $row_h;
… …
796} 802}
797 803
798sub size_allocate { 804sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 805 my ($self, $x, $y, $w, $h) = @_;
800 806
801 $self->_size_allocate ($x, $y, $w, $h) or return; 807 $self->_size_allocate ($x, $y, $w, $h);
802
803 return unless $self->{w};
804 808
805 ($h, $w) = ($w, $h); 809 ($h, $w) = ($w, $h);
806 810
807 my $children = $self->{children}; 811 my $children = $self->{children};
808 812
… …
856} 860}
857 861
858sub size_allocate { 862sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 863 my ($self, $x, $y, $w, $h) = @_;
860 864
861 $self->_size_allocate ($x, $y, $w, $h) or return; 865 $self->_size_allocate ($x, $y, $w, $h);
862
863 return unless $self->{h};
864 866
865 my $children = $self->{children}; 867 my $children = $self->{children};
866 868
867 my @h = map +($_->size_request)[1], @$children; 869 my @h = map +($_->size_request)[1], @$children;
868 870
… …
933 935
934 $self->{text} = $text; 936 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 937 $self->{layout}->set_markup ($text);
936 938
937 delete $self->{texture}; 939 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
938 $self->update; 941 $self->update;
939} 942}
940 943
941sub get_text { 944sub get_text {
942 my ($self, $text) = @_; 945 my ($self, $text) = @_;
… …
975sub _draw { 978sub _draw {
976 my ($self) = @_; 979 my ($self) = @_;
977 980
978 my $tex = $self->{texture} ||= do { 981 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 982 $self->{layout}->set_width ($self->{w});
980 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
981 new_from_layout CFClient::Texture $self->{layout} 984 new_from_layout CFClient::Texture $self->{layout}
982 }; 985 };
983 986
984 glEnable GL_BLEND; 987 glEnable GL_BLEND;
985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
991 my $x = 994 my $x =
992 $self->{align} < 0 ? $self->{padding} 995 $self->{align} < 0 ? $self->{padding}
993 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994 : ($self->{w} - $tex->{w}) * 0.5; 997 : ($self->{w} - $tex->{w}) * 0.5;
995 998
996 $tex->draw_quad ($x, $self->{padding}); 999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
1000 $tex->draw_quad (0, 0);
997 1001
998 glDisable GL_TEXTURE_2D; 1002 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1003 glDisable GL_BLEND;
1000} 1004}
1001 1005
… …
1012 my $class = shift; 1016 my $class = shift;
1013 1017
1014 $class->SUPER::new ( 1018 $class->SUPER::new (
1015 fg => [1, 1, 1], 1019 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2], 1020 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1], 1021 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
1019 @_ 1025 @_
1020 ) 1026 )
1021} 1027}
1022 1028
1023sub _set_text { 1029sub _set_text {
1024 my ($self, $text) = @_; 1030 my ($self, $text) = @_;
1025 1031
1032 my $old_text = $self->{text};
1033
1026 $self->{last_activity} = $::NOW; 1034 $self->{last_activity} = $::NOW;
1027 1035
1028 $self->{text} = $text; 1036 $self->{text} = $text;
1029 $self->{layout}->set_width ($self->{w}); 1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1030 1039
1031 $text =~ s/./*/g if $self->{hidden}; 1040 $text =~ s/./*/g if $self->{hidden};
1032 1041
1033 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1034 1043
1035 $text = substr $text, 0, $self->{cursor}; 1044 $text = substr $text, 0, $self->{cursor};
1036 utf8::encode $text; 1045 utf8::encode $text;
1037 1046
1038 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1039} 1051}
1040 1052
1041sub size_request { 1053sub size_request {
1042 my ($self) = @_; 1054 my ($self) = @_;
1043 1055
… …
1082 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1083 } elsif ($sym == SDLK_HOME) { 1095 } elsif ($sym == SDLK_HOME) {
1084 $self->{cursor} = 0; 1096 $self->{cursor} = 0;
1085 } elsif ($sym == SDLK_END) { 1097 } elsif ($sym == SDLK_END) {
1086 $self->{cursor} = length $text; 1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1087 } elsif ($uni) { 1101 } elsif ($uni) {
1088 substr $text, $self->{cursor}++, 0, chr $uni; 1102 substr $text, $self->{cursor}++, 0, chr $uni;
1089 } 1103 }
1090 1104
1091 $self->_set_text ($text); 1105 $self->_set_text ($text);
… …
1153 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1154 glEnd; 1168 glEnd;
1155 } 1169 }
1156} 1170}
1157 1171
1158#############################################################################
1159
1160package CFClient::UI::Slider; 1172package CFClient::UI::LineEntry;
1161 1173
1162use strict; 1174our @ISA = CFClient::UI::Entry::;
1163 1175
1176use SDL;
1164use SDL::OpenGL; 1177use SDL::OpenGL;
1165 1178
1179sub key_down {
1180 my ($self, $ev) = @_;
1181
1182 my $sym = $ev->key_sym;
1183
1184 if ($sym == SDLK_RETURN) {
1185 $self->emit (activate => $self->get_text);
1186 $self->update;
1187
1188 } else {
1189 $self->SUPER::key_down ($ev);
1190 }
1191
1192}
1193
1194#############################################################################
1195
1196package CFClient::UI::Button;
1197
1166our @ISA = CFClient::UI::DrawBG::; 1198our @ISA = CFClient::UI::Label::;
1199
1200use SDL;
1201use SDL::OpenGL;
1202
1203my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1205 qw(b1_button_active.png);
1167 1206
1168sub new { 1207sub new {
1169 my $class = shift; 1208 my $class = shift;
1170 1209
1210 $class->SUPER::new (
1211 padding => 4,
1212 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0],
1215 can_hover => 1,
1216 @_
1217 )
1218}
1219
1220sub button_up {
1221 my ($self, $ev, $x, $y) = @_;
1222
1223 if ($x >= 0 && $x < $self->{w}
1224 && $y >= 0 && $y < $self->{h}) {
1225 $self->emit ("activate");
1226 }
1227}
1228
1229sub _draw {
1230 my ($self) = @_;
1231
1232 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
1234
1235 glEnable GL_BLEND;
1236 glEnable GL_TEXTURE_2D;
1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238
1239 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg};
1241 }
1242
1243 glBindTexture GL_TEXTURE_2D, $tex->{name};
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1245
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1247
1248 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND;
1250
1251 $self->SUPER::_draw;
1252}
1253
1254#############################################################################
1255
1256package CFClient::UI::CheckBox;
1257
1258our @ISA = CFClient::UI::DrawBG::;
1259
1260my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263
1264use SDL;
1265use SDL::OpenGL;
1266
1267sub new {
1268 my $class = shift;
1269
1270 $class->SUPER::new (
1271 padding => 2,
1272 fg => [1, 1, 1],
1273 active_fg => [1, 1, 0],
1274 state => 0,
1275 can_hover => 1,
1276 @_
1277 )
1278}
1279
1280sub size_request {
1281 my ($self) = @_;
1282
1283 ($self->{padding} * 2 + 6) x 2
1284}
1285
1286sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_;
1288
1289 $self->_size_allocate ($x, $y, $w, $h);
1290}
1291
1292sub button_down {
1293 my ($self, $ev, $x, $y) = @_;
1294
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1297 $self->{state} = !$self->{state};
1298 $self->emit (changed => $self->{state});
1299 }
1300}
1301
1302sub _draw {
1303 my ($self) = @_;
1304
1305 $self->SUPER::_draw;
1306
1307 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1308
1309 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1310
1311 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1312
1313 glEnable GL_BLEND;
1314 glEnable GL_TEXTURE_2D;
1315 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1316
1317 my $tex = $self->{state} ? $tex[1] : $tex[0];
1318
1319 $tex->draw_quad (0, 0, $s, $s);
1320
1321 glDisable GL_TEXTURE_2D;
1322 glDisable GL_BLEND;
1323}
1324
1325#############################################################################
1326
1327package CFClient::UI::Slider;
1328
1329use strict;
1330
1331use SDL::OpenGL;
1332
1333our @ISA = CFClient::UI::DrawBG::;
1334
1335my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1337 qw(s1_slider.png s1_slider_bg.png);
1338
1339sub new {
1340 my $class = shift;
1341
1171 # range [value, low, high, page] 1342 # range [value, low, high, page]
1172 1343
1344 # TODO: 0-width page
1345 # TODO: req_w/h are wrong with vertical
1346 # TODO: calculations are off
1173 my $self = $class->SUPER::new ( 1347 my $self = $class->SUPER::new (
1174 fg => [1, 1, 1], 1348 fg => [1, 1, 1],
1175 active_fg => [0, 0, 0], 1349 active_fg => [0, 0, 0],
1176 range => [0, 0, 100, 10], 1350 range => [0, 0, 100, 10],
1177 req_w => 40, 1351 req_w => 40,
1178 req_h => 10, 1352 req_h => 13,
1179 vertical => 0, 1353 vertical => 0,
1354 can_hover => 1,
1355 inner_pad => 5,
1180 @_ 1356 @_
1181 ); 1357 );
1182 1358
1183 $self 1359 $self
1184} 1360}
… …
1205 if ($GRAB == $self) { 1381 if ($GRAB == $self) {
1206 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1207 1383
1208 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1209 1385
1386 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1387 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1388
1389 $x -= $inner_pad_px; # substract the padding
1210 $x = $x * ($hi - $lo) / $w + $lo; 1390 $x = $x * ($hi - $lo) / $inner_w + $lo;
1211 $x = $lo if $x < $lo; 1391 $x = $lo if $x < $lo;
1212 $x = $hi - $page if $x > $hi - $page; 1392 $x = $hi - $page if $x > $hi - $page;
1213 $self->{range}[0] = $x; 1393 $self->{range}[0] = $x;
1214 1394
1215 $self->emit (changed => $x); 1395 $self->emit (changed => $x);
1216 $self->update; 1396 $self->update;
1217 } 1397 }
1398}
1399
1400# the inner_* stuff is for generating a padding for the slider handle,
1401# so that the handle doesn't leave the texture. This calculation isn't 100%
1402# correct propably, but it does the job for now
1403sub _calc_inner_pad_px {
1404 my ($self, $w) = @_;
1405 ($w / 100) * $self->{inner_pad} # % to pixels
1218} 1406}
1219 1407
1220sub _draw { 1408sub _draw {
1221 my ($self) = @_; 1409 my ($self) = @_;
1222 1410
… …
1236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1238 1426
1239 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1427 my ($value, $lo, $hi, $page) = @{$self->{range}};
1240 1428
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431
1241 $page = int $page * $w / ($hi - $lo); 1432 $page = int $page * $inner_w / ($hi - $lo);
1242 $value = int +($value - $lo) * $w / ($hi - $lo); 1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1243 1434
1244 $w -= $page; 1435 $w -= $page;
1245 $page &= ~1; 1436 $page &= ~1;
1246 glTranslate $page * 0.5, 0, 0; 1437 glTranslate $page * 0.5, 0, 0;
1438 $page ||= 2;
1247 1439
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; 1440 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1256 my $knob_b = $value + $page * 0.5; 1441 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1257 1442
1258 glBegin GL_QUADS; 1443 glEnable GL_BLEND;
1259 glColor @$fg; 1444 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1260 glVertex $knob_a, 0; 1445 glEnable GL_TEXTURE_2D;
1261 glVertex $knob_a, $h; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1262 glVertex $knob_b, $h;
1263 glVertex $knob_b, 0;
1264 1447
1265 if ($knob_a < $knob_b - 2) { 1448 # draw background
1266 glColor @$bg; 1449 $tex[1]->draw_quad (0, 0, $w, $h);
1267 glVertex $knob_a + 1, 1; 1450
1268 glVertex $knob_a + 1, $h - 1; 1451 # draw handle
1269 glVertex $knob_b - 1, $h - 1; 1452 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1270 glVertex $knob_b - 1, 1; 1453
1454 glDisable GL_BLEND;
1455 glDisable GL_TEXTURE_2D;
1456}
1457
1458#############################################################################
1459
1460package CFClient::UI::TextView;
1461
1462our @ISA = CFClient::UI::HBox::;
1463
1464use SDL::OpenGL;
1465
1466sub new {
1467 my $class = shift;
1468
1469 my $self = $class->SUPER::new (
1470 par => [],
1471 @_,
1472 children => [
1473 (new CFClient::UI::Empty expand => 1),
1474 (new CFClient::UI::Slider vertical => 1),
1475 ],
1476 );
1477
1478 $self
1479}
1480
1481sub add_paragraph {
1482 my ($self, $color, $text) = @_;
1483
1484 push @{$self->{par}}, [$color, $text];
1485 my $count = scalar @{$self->{par}};
1486 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1487 $self->{children}[1]->update;
1488}
1489
1490sub _draw {
1491 my ($self) = @_;
1492
1493 my $par = $self->{par};
1494
1495 my $bottom = (scalar @$par) - 1;
1496
1497 my $w = $self->{children}[0]{w};
1498 my $y = $self->{h};
1499
1500 glEnable GL_BLEND;
1501 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1502 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504
1505 # TODO: everything!
1506 while ($y > 0 && $bottom >= 0) {
1507 my $par = $par->[$bottom--];
1508
1509 my $layout = new CFClient::Layout;
1510
1511 $layout->set_height ($::FONTSIZE);
1512 $layout->set_width ($w);
1513 $layout->set_text ($par->[1]);
1514 my $tex = new_from_layout CFClient::Texture $layout;
1515 $y -= $tex->{h};
1516
1517 glColor @{ $par->[0] };
1518 $tex->draw_quad (0, $y);
1271 } 1519 }
1272 glEnd; 1520
1521 glDisable GL_TEXTURE_2D;
1522 glDisable GL_BLEND;
1273} 1523}
1274 1524
1275############################################################################# 1525#############################################################################
1276 1526
1277package CFClient::UI::MapWidget; 1527package CFClient::UI::MapWidget;
… …
1287 1537
1288sub new { 1538sub new {
1289 my $class = shift; 1539 my $class = shift;
1290 1540
1291 $class->SUPER::new ( 1541 $class->SUPER::new (
1292 z => -1, 1542 z => -1,
1543 can_focus => 1,
1293 list => (glGenLists 1), 1544 list => (glGenLists 1),
1294 @_ 1545 @_
1295 ) 1546 )
1296} 1547}
1297 1548
1298sub key_down { 1549sub key_down {
… …
1317} 1568}
1318 1569
1319sub draw { 1570sub draw {
1320 my ($self) = @_; 1571 my ($self) = @_;
1321 1572
1573 $self->{need_update}++;#d#
1322 if (delete $self->{need_update}) { 1574 if (delete $self->{need_update}) {
1323 glNewList $self->{list}, GL_COMPILE; 1575 glNewList $self->{list}, GL_COMPILE;
1324 1576
1325 my $mx = $::CONN->{mapx};
1326 my $my = $::CONN->{mapy};
1327
1328 my $map = $::CONN->{map};
1329
1330 my ($xofs, $yofs);
1331
1332 my $sw = 1 + int $::WIDTH / 32; 1577 my $sw = int $::WIDTH / 32;
1333 my $sh = 1 + int $::HEIGHT / 32; 1578 my $sh = int $::HEIGHT / 32;
1334 1579
1335 if ($::CONN->{mapw} > $sw) { 1580 if ($::MAP) {
1336 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1581 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1337 } else {
1338 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1339 }
1340 1582
1341 if ($::CONN->{maph} > $sh) { 1583 if ($::CFG->{fow_enable}) {
1342 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1584 if ($::CFG->{fow_smooth}) { # smooth fog of war
1343 } else { 1585 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1344 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1586 glConvolutionFilter2D
1345 } 1587 GL_CONVOLUTION_2D,
1346 1588 GL_ALPHA,
1347 glEnable GL_TEXTURE_2D; 1589 3, 3,
1348 glEnable GL_BLEND; 1590 GL_ALPHA, GL_FLOAT,
1349 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1591 pack "f*",
1350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1592 0.1, 0.1, 0.1,
1351 1593 0.1, 0.2, 0.1,
1352 my $sw4 = ($sw + 3) & ~3; 1594 0.1, 0.1, 0.1,
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; 1595 ;
1361 1596 glEnable GL_CONVOLUTION_2D;
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 } 1597 }
1368 1598
1369 for my $num (grep $_, @$cell[1,2,3]) { 1599 my $tex = new CFClient::Texture
1370 my $tex = $::CONN->{face}[$num]{texture} || next; 1600 w => $w,
1371 1601 h => $h,
1372 my ($w, $h) = @$tex{qw(w h)}; 1602 data => $data,
1603 internalformat => GL_ALPHA,
1604 format => GL_ALPHA;
1373 1605
1374 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1606 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1375 } 1607
1608 glEnable GL_BLEND;
1609 glEnable GL_TEXTURE_2D;
1610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1611
1612 glColor +($::CFG->{fow_intensity}) x 3, 1;
1613 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1614
1615 glDisable GL_TEXTURE_2D;
1616 glDisable GL_BLEND;
1376 } 1617 }
1377 } 1618 }
1378 1619
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; 1620 glEndList;
1405 } 1621 }
1406 1622
1407 glCallList $self->{list}; 1623 glCallList $self->{list};
1624
1625 if ($FOCUS != $self) {
1626 glColor 64/255, 64/255, 64/255;
1627 glLogicOp GL_AND;
1628 glEnable GL_COLOR_LOGIC_OP;
1629 glBegin GL_QUADS;
1630 glVertex 0, 0;
1631 glVertex 0, $::HEIGHT;
1632 glVertex $::WIDTH, $::HEIGHT;
1633 glVertex $::WIDTH, 0;
1634 glEnd;
1635 glDisable GL_COLOR_LOGIC_OP;
1636 }
1408} 1637}
1409 1638
1410my %DIR = ( 1639my %DIR = (
1411 SDLK_KP8, [1, "north"], 1640 SDLK_KP8, [1, "north"],
1412 SDLK_KP9, [2, "northeast"], 1641 SDLK_KP9, [2, "northeast"],
… …
1428 1657
1429 my $mod = $ev->key_mod; 1658 my $mod = $ev->key_mod;
1430 my $sym = $ev->key_sym; 1659 my $sym = $ev->key_sym;
1431 1660
1432 if ($sym == SDLK_KP5) { 1661 if ($sym == SDLK_KP5) {
1433 $::CONN->send ("command stay fire"); 1662 $::CONN->user_send ("command stay fire");
1663 } elsif ($sym == SDLK_a) {
1664 $::CONN->user_send ("command apply");
1665 } elsif ($sym == SDLK_QUOTE) {
1666 $self->emit ('activate_console');
1667 } elsif ($sym == SDLK_SLASH) {
1668 $self->emit ('activate_console' => '/');
1434 } elsif (exists $DIR{$sym}) { 1669 } elsif (exists $DIR{$sym}) {
1435 if ($mod & KMOD_SHIFT) { 1670 if ($mod & KMOD_SHIFT) {
1436 $self->{shft}++; 1671 $self->{shft}++;
1437 $::CONN->send ("command fire $DIR{$sym}[0]"); 1672 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1438 } elsif ($mod & KMOD_CTRL) { 1673 } elsif ($mod & KMOD_CTRL) {
1439 $self->{ctrl}++; 1674 $self->{ctrl}++;
1440 $::CONN->send ("command run $DIR{$sym}[0]"); 1675 $::CONN->user_send ("command run $DIR{$sym}[0]");
1441 } else { 1676 } else {
1442 $::CONN->send ("command $DIR{$sym}[1]"); 1677 $::CONN->user_send ("command $DIR{$sym}[1]");
1443 } 1678 }
1444 } 1679 }
1445} 1680}
1446 1681
1447sub key_up { 1682sub key_up {
… …
1449 1684
1450 my $mod = $ev->key_mod; 1685 my $mod = $ev->key_mod;
1451 my $sym = $ev->key_sym; 1686 my $sym = $ev->key_sym;
1452 1687
1453 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1688 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1454 $::CONN->send ("command fire_stop"); 1689 $::CONN->user_send ("command fire_stop");
1455 } 1690 }
1456 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1691 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1457 $::CONN->send ("command run_stop"); 1692 $::CONN->user_send ("command run_stop");
1458 } 1693 }
1459} 1694}
1460 1695
1461############################################################################# 1696#############################################################################
1462 1697
… …
1500 glPopMatrix; 1735 glPopMatrix;
1501} 1736}
1502 1737
1503############################################################################# 1738#############################################################################
1504 1739
1740package CFClient::UI::Flopper;
1741
1742our @ISA = CFClient::UI::Button::;
1743
1744sub new {
1745 my $class = shift;
1746
1747 my $self = $class->SUPER::new (
1748 state => 0,
1749 connect_activate => \&toggle_flopper,
1750 @_
1751 );
1752
1753 if ($self->{state}) {
1754 $self->{state} = 0;
1755 $self->toggle_flopper;
1756 }
1757
1758 $self
1759}
1760
1761sub toggle_flopper {
1762 my ($self) = @_;
1763
1764 # TODO: use animation
1765 if ($self->{state} = !$self->{state}) {
1766 $CFClient::UI::TOPLEVEL->add ($self->{other});
1767 $self->{other}->move (
1768 ($::WIDTH - $self->{other}{w}) * 0.5,
1769 ($::HEIGHT - $self->{other}{h}) * 0.5,
1770 );
1771 } else {
1772 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1773 }
1774}
1775
1776#############################################################################
1777
1505package CFClient::UI::Toplevel; 1778package CFClient::UI::Toplevel;
1506 1779
1507our @ISA = CFClient::UI::Container::; 1780our @ISA = CFClient::UI::Container::;
1508 1781
1509sub size_request { 1782sub size_request {

Diff Legend

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