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.88 by root, Wed Apr 12 21:01:46 2006 UTC vs.
Revision 1.103 by elmex, Fri Apr 14 13:51:36 2006 UTC

… …
144 144
145sub focus_in { 145sub focus_in {
146 my ($self) = @_; 146 my ($self) = @_;
147 147
148 return if $FOCUS == $self; 148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
149 150
150 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
151 $focus->update if $focus; 152 $focus->update if $focus;
152 $FOCUS->update; 153 $FOCUS->update;
153} 154}
… …
186 glPushMatrix; 187 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 189 $self->_draw;
189 glPopMatrix; 190 glPopMatrix;
190 191
191 if ($self == $HOVER) { 192 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 193 my ($x, $y) = @$self{qw(x y)};
193 194
194 glColor 0, 0, 1, 0.2; 195 glColor 0, 0, 1, 0.2;
195 glEnable GL_BLEND; 196 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
529 530
530my @tex = 531my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 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); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533 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
534sub size_request { 548sub size_request {
535 my ($self) = @_; 549 my ($self) = @_;
536 550
537 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};
538 552
539 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
540 554
541 $h += $tex[1]->{h}; 555 (
542 $h += $tex[4]->{h}; 556 $w + $self->{border} * 2,
543 $w += $tex[2]->{w}; 557 $h + $self->{border} * 2,
544 $w += $tex[3]->{w}; 558 )
545
546 ($w, $h)
547} 559}
548 560
549sub size_allocate { 561sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
551 563
552 $self->_size_allocate ($x, $y, $w, $h) or return; 564 $self->_size_allocate ($x, $y, $w, $h) or return;
553 565
554 $h -= $tex[1]{h}; 566 $h -= List::Util::max 0, $self->{border} * 2;
555 $h -= $tex[4]{h}; 567 $w -= List::Util::max 0, $self->{border} * 2;
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558 568
559 $h = $h < 0 ? 0 : $h; 569 $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} 570}
566 571
567sub button_down { 572sub button_down {
568 my ($self, $ev, $x, $y) = @_; 573 my ($self, $ev, $x, $y) = @_;
569 574
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572 577
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h}); 579 my ($bw, $bh) = ($self->{w}, $self->{h});
575 580
576 $self->{motion} = sub { 581 $self->{motion} = sub {
… …
582 $self->{user_h} = $bh + $y - $oy; 587 $self->{user_h} = $bh + $y - $oy;
583 $self->update; 588 $self->update;
584 }; 589 };
585 590
586 } elsif ($x >= 0 && $x < $self->{w} 591 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) { 592 && $y >= 0 && $y < $self->{border}) {
588 593
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y}); 595 my ($bx, $by) = ($self->{x}, $self->{y});
591 596
592 $self->{motion} = sub { 597 $self->{motion} = sub {
… …
613} 618}
614 619
615sub _draw { 620sub _draw {
616 my ($self) = @_; 621 my ($self) = @_;
617 622
618 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 625
621 glEnable GL_BLEND; 626 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625 630
626 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
627 $top->draw_quad (0, 0, $w, $top->{h}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
628 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 635 $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 636
638 my $bg = $tex[0]; 637 my $bg = $tex[0];
639 638
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 639 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643 my $rep_x = $cw / $bg->{w}; 640 my $rep_x = $cw / $bg->{w};
644 my $rep_y = $ch / $bg->{h}; 641 my $rep_y = $ch / $bg->{h};
645 642
643 glColor @{ $self->{bg} };
644
645 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1;
646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
647 649
648 glDisable GL_TEXTURE_2D; 650 glDisable GL_TEXTURE_2D;
649 glDisable GL_BLEND; 651 glDisable GL_BLEND;
650 652
651 $self->child->draw; 653 $self->child->draw;
652
653} 654}
654 655
655############################################################################# 656#############################################################################
656 657
657package CFClient::UI::Table; 658package CFClient::UI::Table;
… …
993 my $x = 994 my $x =
994 $self->{align} < 0 ? $self->{padding} 995 $self->{align} < 0 ? $self->{padding}
995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996 : ($self->{w} - $tex->{w}) * 0.5; 997 : ($self->{w} - $tex->{w}) * 0.5;
997 998
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0; 999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
999 $tex->draw_quad (0, 0); 1000 $tex->draw_quad (0, 0);
1000 1001
1001 glDisable GL_TEXTURE_2D; 1002 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND; 1003 glDisable GL_BLEND;
1003} 1004}
… …
1017 $class->SUPER::new ( 1018 $class->SUPER::new (
1018 fg => [1, 1, 1], 1019 fg => [1, 1, 1],
1019 bg => [0, 0, 0, 0.2], 1020 bg => [0, 0, 0, 0.2],
1020 active_bg => [1, 1, 1, 0.5], 1021 active_bg => [1, 1, 1, 0.5],
1021 active_fg => [0, 0, 0], 1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
1022 @_ 1025 @_
1023 ) 1026 )
1024} 1027}
1025 1028
1026sub _set_text { 1029sub _set_text {
1027 my ($self, $text) = @_; 1030 my ($self, $text) = @_;
1031
1032 my $old_text = $self->{text};
1028 1033
1029 $self->{last_activity} = $::NOW; 1034 $self->{last_activity} = $::NOW;
1030 1035
1031 $self->{text} = $text; 1036 $self->{text} = $text;
1032 $self->{layout}->set_width ($self->{w}); 1037 $self->{layout}->set_width ($self->{w});
… …
1038 1043
1039 $text = substr $text, 0, $self->{cursor}; 1044 $text = substr $text, 0, $self->{cursor};
1040 utf8::encode $text; 1045 utf8::encode $text;
1041 1046
1042 @$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};
1043} 1051}
1044 1052
1045sub size_request { 1053sub size_request {
1046 my ($self) = @_; 1054 my ($self) = @_;
1047 1055
… …
1086 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1087 } elsif ($sym == SDLK_HOME) { 1095 } elsif ($sym == SDLK_HOME) {
1088 $self->{cursor} = 0; 1096 $self->{cursor} = 0;
1089 } elsif ($sym == SDLK_END) { 1097 } elsif ($sym == SDLK_END) {
1090 $self->{cursor} = length $text; 1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1091 } elsif ($uni) { 1101 } elsif ($uni) {
1092 substr $text, $self->{cursor}++, 0, chr $uni; 1102 substr $text, $self->{cursor}++, 0, chr $uni;
1093 } 1103 }
1094 1104
1095 $self->_set_text ($text); 1105 $self->_set_text ($text);
… …
1157 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1158 glEnd; 1168 glEnd;
1159 } 1169 }
1160} 1170}
1161 1171
1172package CFClient::UI::LineEntry;
1173
1174our @ISA = CFClient::UI::Entry::;
1175
1176use SDL;
1177use SDL::OpenGL;
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
1162############################################################################# 1194#############################################################################
1163 1195
1164package CFClient::UI::Button; 1196package CFClient::UI::Button;
1165 1197
1166our @ISA = CFClient::UI::Label::; 1198our @ISA = CFClient::UI::Label::;
… …
1178 $class->SUPER::new ( 1210 $class->SUPER::new (
1179 padding => 4, 1211 padding => 4,
1180 fg => [1, 1, 1], 1212 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1213 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0], 1214 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5], 1215 can_hover => 1,
1184# border_fg => [1, 1, 0],
1185 @_ 1216 @_
1186 ) 1217 )
1187} 1218}
1188 1219
1189sub button_up { 1220sub button_up {
… …
1223############################################################################# 1254#############################################################################
1224 1255
1225package CFClient::UI::CheckBox; 1256package CFClient::UI::CheckBox;
1226 1257
1227our @ISA = CFClient::UI::DrawBG::; 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);
1228 1263
1229use SDL; 1264use SDL;
1230use SDL::OpenGL; 1265use SDL::OpenGL;
1231 1266
1232sub new { 1267sub new {
… …
1235 $class->SUPER::new ( 1270 $class->SUPER::new (
1236 padding => 2, 1271 padding => 2,
1237 fg => [1, 1, 1], 1272 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0], 1273 active_fg => [1, 1, 0],
1239 state => 0, 1274 state => 0,
1275 can_hover => 1,
1240 @_ 1276 @_
1241 ) 1277 )
1242} 1278}
1243 1279
1244sub size_request { 1280sub size_request {
… …
1269 $self->SUPER::_draw; 1305 $self->SUPER::_draw;
1270 1306
1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1307 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272 1308
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1309 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274 1310
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1311 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276 1312
1277 glBegin GL_LINE_LOOP; 1313 glEnable GL_BLEND;
1278 glVertex 0 , 0; 1314 glEnable GL_TEXTURE_2D;
1279 glVertex 0 , $s; 1315 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283 1316
1284 if ($self->{state}) { 1317 my $tex = $self->{state} ? $tex[1] : $tex[0];
1285 glBegin GL_LINES; 1318
1286 glVertex 0 , 0; 1319 $tex->draw_quad (0, 0, $s, $s);
1287 glVertex $s, $s; 1320
1288 glVertex $s, 0; 1321 glDisable GL_TEXTURE_2D;
1289 glVertex 0 , $s; 1322 glDisable GL_BLEND;
1290 glEnd;
1291 }
1292} 1323}
1293 1324
1294############################################################################# 1325#############################################################################
1295 1326
1296package CFClient::UI::Slider; 1327package CFClient::UI::Slider;
… …
1298use strict; 1329use strict;
1299 1330
1300use SDL::OpenGL; 1331use SDL::OpenGL;
1301 1332
1302our @ISA = CFClient::UI::DrawBG::; 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);
1303 1338
1304sub new { 1339sub new {
1305 my $class = shift; 1340 my $class = shift;
1306 1341
1307 # range [value, low, high, page] 1342 # range [value, low, high, page]
1308 1343
1344 # TODO: 0-width page
1345 # TODO: req_w/h are wrong with vertical
1346 # TODO: calculations are off
1309 my $self = $class->SUPER::new ( 1347 my $self = $class->SUPER::new (
1310 fg => [1, 1, 1], 1348 fg => [1, 1, 1],
1311 active_fg => [0, 0, 0], 1349 active_fg => [0, 0, 0],
1312 range => [0, 0, 100, 10], 1350 range => [0, 0, 100, 10],
1313 req_w => 40, 1351 req_w => 40,
1314 req_h => 10, 1352 req_h => 13,
1315 vertical => 0, 1353 vertical => 0,
1354 can_hover => 1,
1355 inner_pad => 5,
1316 @_ 1356 @_
1317 ); 1357 );
1318 1358
1319 $self 1359 $self
1320} 1360}
… …
1341 if ($GRAB == $self) { 1381 if ($GRAB == $self) {
1342 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1343 1383
1344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345 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
1346 $x = $x * ($hi - $lo) / $w + $lo; 1390 $x = $x * ($hi - $lo) / $inner_w + $lo;
1347 $x = $lo if $x < $lo; 1391 $x = $lo if $x < $lo;
1348 $x = $hi - $page if $x > $hi - $page; 1392 $x = $hi - $page if $x > $hi - $page;
1349 $self->{range}[0] = $x; 1393 $self->{range}[0] = $x;
1350 1394
1351 $self->emit (changed => $x); 1395 $self->emit (changed => $x);
1352 $self->update; 1396 $self->update;
1353 } 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
1354} 1406}
1355 1407
1356sub _draw { 1408sub _draw {
1357 my ($self) = @_; 1409 my ($self) = @_;
1358 1410
… …
1372 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374 1426
1375 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1427 my ($value, $lo, $hi, $page) = @{$self->{range}};
1376 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
1377 $page = int $page * $w / ($hi - $lo); 1432 $page = int $page * $inner_w / ($hi - $lo);
1378 $value = int +($value - $lo) * $w / ($hi - $lo); 1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1379 1434
1380 $w -= $page; 1435 $w -= $page;
1381 $page &= ~1; 1436 $page &= ~1;
1382 glTranslate $page * 0.5, 0, 0; 1437 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2; 1438 $page ||= 2;
1384 1439
1385 glColor @$fg;
1386 glBegin GL_LINES;
1387 glVertex 0, 0; glVertex 0, $h;
1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
1389 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390 glEnd;
1391
1392 my $knob_a = $value - $page * 0.5; 1440 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1393 my $knob_b = $value + $page * 0.5; 1441 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1394 1442
1395 glBegin GL_QUADS; 1443 glEnable GL_BLEND;
1396 glColor @$fg; 1444 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1397 glVertex $knob_a, 0; 1445 glEnable GL_TEXTURE_2D;
1398 glVertex $knob_a, $h; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1399 glVertex $knob_b, $h;
1400 glVertex $knob_b, 0;
1401 1447
1402 if ($knob_a < $knob_b - 2) { 1448 # draw background
1403 glColor @$bg; 1449 $tex[1]->draw_quad (0, 0, $w, $h);
1404 glVertex $knob_a + 1, 1; 1450
1405 glVertex $knob_a + 1, $h - 1; 1451 # draw handle
1406 glVertex $knob_b - 1, $h - 1; 1452 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1407 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);
1408 } 1519 }
1409 glEnd; 1520
1521 glDisable GL_TEXTURE_2D;
1522 glDisable GL_BLEND;
1410} 1523}
1411 1524
1412############################################################################# 1525#############################################################################
1413 1526
1414package CFClient::UI::MapWidget; 1527package CFClient::UI::MapWidget;
… …
1424 1537
1425sub new { 1538sub new {
1426 my $class = shift; 1539 my $class = shift;
1427 1540
1428 $class->SUPER::new ( 1541 $class->SUPER::new (
1429 z => -1, 1542 z => -1,
1543 can_focus => 1,
1430 list => (glGenLists 1), 1544 list => (glGenLists 1),
1431 @_ 1545 @_
1432 ) 1546 )
1433} 1547}
1434 1548
1435sub key_down { 1549sub key_down {
… …
1454} 1568}
1455 1569
1456sub draw { 1570sub draw {
1457 my ($self) = @_; 1571 my ($self) = @_;
1458 1572
1573 $self->{need_update}++;#d#
1459 if (delete $self->{need_update}) { 1574 if (delete $self->{need_update}) {
1460 glNewList $self->{list}, GL_COMPILE; 1575 glNewList $self->{list}, GL_COMPILE;
1461 1576
1462 my $mx = $::CONN->{mapx};
1463 my $my = $::CONN->{mapy};
1464
1465 my $map = $::CONN->{map};
1466
1467 my ($xofs, $yofs);
1468
1469 my $sw = 1 + int $::WIDTH / 32; 1577 my $sw = int $::WIDTH / 32;
1470 my $sh = 1 + int $::HEIGHT / 32; 1578 my $sh = int $::HEIGHT / 32;
1471 1579
1472 if ($::CONN->{mapw} > $sw) { 1580 if ($::MAP) {
1473 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1581 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1474 } else {
1475 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1476 }
1477 1582
1478 if ($::CONN->{maph} > $sh) { 1583 if ($::CFG->{fow_enable}) {
1479 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1584 if ($::CFG->{fow_smooth}) { # smooth fog of war
1480 } else { 1585 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1481 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1586 glConvolutionFilter2D
1482 } 1587 GL_CONVOLUTION_2D,
1483 1588 GL_ALPHA,
1484 glEnable GL_TEXTURE_2D; 1589 3, 3,
1485 glEnable GL_BLEND; 1590 GL_ALPHA, GL_FLOAT,
1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1591 pack "f*",
1487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1592 0.1, 0.1, 0.1,
1488 glColor 1, 1, 1, 1; 1593 0.1, 0.2, 0.1,
1489 1594 0.1, 0.1, 0.1,
1490 my $sw4 = ($sw + 3) & ~3;
1491 my $darkness = "\x00" x ($sw4 * $sh);
1492
1493 for my $x (0 .. $sw - 1) {
1494 my $row = $map->[$x + $xofs];
1495 for my $y (0 .. $sh - 1) {
1496
1497 my $cell = $row->[$y + $yofs]
1498 or next; 1595 ;
1499 1596 glEnable GL_CONVOLUTION_2D;
1500 my $dark = $cell->[0];
1501 if ($dark < 0) {
1502 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1503 } else {
1504 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1505 } 1597 }
1506 1598
1507 for my $num (grep $_, @$cell[1,2,3]) { 1599 my $tex = new CFClient::Texture
1508 my $tex = $::CONN->{face}[$num]{texture} || next; 1600 w => $w,
1509 1601 h => $h,
1510 my ($w, $h) = @$tex{qw(w h)}; 1602 data => $data,
1603 internalformat => GL_ALPHA,
1604 format => GL_ALPHA;
1511 1605
1512 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1606 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1513 } 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;
1514 } 1617 }
1515 } 1618 }
1516 1619
1517# if (1) { # higher quality darkness
1518# $lighting =~ s/(.)/$1$1$1/gs;
1519# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1520#
1521# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1522#
1523# $lighting = $pb->get_pixels;
1524# $lighting =~ s/(.)../$1/gs;
1525# }
1526
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1528
1529 $darkness = new CFClient::Texture
1530 w => $sw4,
1531 h => $sh,
1532 data => $darkness,
1533 internalformat => GL_ALPHA,
1534 format => GL_ALPHA;
1535
1536 glColor 0.45, 0.45, 0.45, 1;
1537 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1538
1539 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541
1542 glEndList; 1620 glEndList;
1543 } 1621 }
1544 1622
1545 glCallList $self->{list}; 1623 glCallList $self->{list};
1546 1624
1547 if ($FOCUS != $self) { 1625 if ($FOCUS != $self) {
1548 glEnable GL_BLEND; 1626 glColor 64/255, 64/255, 64/255;
1549 glColor 0, 0, 1, 0.4; 1627 glLogicOp GL_AND;
1628 glEnable GL_COLOR_LOGIC_OP;
1550 glBegin GL_QUADS; 1629 glBegin GL_QUADS;
1551 glVertex 0, 0; 1630 glVertex 0, 0;
1552 glVertex 0, $::HEIGHT; 1631 glVertex 0, $::HEIGHT;
1553 glVertex $::WIDTH, $::HEIGHT; 1632 glVertex $::WIDTH, $::HEIGHT;
1554 glVertex $::WIDTH, 0; 1633 glVertex $::WIDTH, 0;
1555 glEnd; 1634 glEnd;
1556 glDisable GL_BLEND; 1635 glDisable GL_COLOR_LOGIC_OP;
1557 } 1636 }
1558} 1637}
1559 1638
1560my %DIR = ( 1639my %DIR = (
1561 SDLK_KP8, [1, "north"], 1640 SDLK_KP8, [1, "north"],
… …
1578 1657
1579 my $mod = $ev->key_mod; 1658 my $mod = $ev->key_mod;
1580 my $sym = $ev->key_sym; 1659 my $sym = $ev->key_sym;
1581 1660
1582 if ($sym == SDLK_KP5) { 1661 if ($sym == SDLK_KP5) {
1583 $::CONN->send ("command stay fire"); 1662 $::CONN->user_send ("command stay fire");
1584 } elsif ($sym == SDLK_a) { 1663 } elsif ($sym == SDLK_a) {
1585 $::CONN->send ("command apply"); 1664 $::CONN->user_send ("command apply");
1665 } elsif ($sym == SDLK_QUOTE) {
1666 $self->emit ('activate_console');
1586 } elsif (exists $DIR{$sym}) { 1667 } elsif (exists $DIR{$sym}) {
1587 if ($mod & KMOD_SHIFT) { 1668 if ($mod & KMOD_SHIFT) {
1588 $self->{shft}++; 1669 $self->{shft}++;
1589 $::CONN->send ("command fire $DIR{$sym}[0]"); 1670 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1590 } elsif ($mod & KMOD_CTRL) { 1671 } elsif ($mod & KMOD_CTRL) {
1591 $self->{ctrl}++; 1672 $self->{ctrl}++;
1592 $::CONN->send ("command run $DIR{$sym}[0]"); 1673 $::CONN->user_send ("command run $DIR{$sym}[0]");
1593 } else { 1674 } else {
1594 $::CONN->send ("command $DIR{$sym}[1]"); 1675 $::CONN->user_send ("command $DIR{$sym}[1]");
1595 } 1676 }
1596 } 1677 }
1597} 1678}
1598 1679
1599sub key_up { 1680sub key_up {
… …
1601 1682
1602 my $mod = $ev->key_mod; 1683 my $mod = $ev->key_mod;
1603 my $sym = $ev->key_sym; 1684 my $sym = $ev->key_sym;
1604 1685
1605 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1686 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1606 $::CONN->send ("command fire_stop"); 1687 $::CONN->user_send ("command fire_stop");
1607 } 1688 }
1608 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1689 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1609 $::CONN->send ("command run_stop"); 1690 $::CONN->user_send ("command run_stop");
1610 } 1691 }
1611} 1692}
1612 1693
1613############################################################################# 1694#############################################################################
1614 1695
… …
1652 glPopMatrix; 1733 glPopMatrix;
1653} 1734}
1654 1735
1655############################################################################# 1736#############################################################################
1656 1737
1738package CFClient::UI::Flopper;
1739
1740our @ISA = CFClient::UI::Button::;
1741
1742sub new {
1743 my $class = shift;
1744
1745 my $self = $class->SUPER::new (
1746 state => 0,
1747 connect_activate => \&toggle_flopper,
1748 @_
1749 );
1750
1751 if ($self->{state}) {
1752 $self->{state} = 0;
1753 $self->toggle_flopper;
1754 }
1755
1756 $self
1757}
1758
1759sub toggle_flopper {
1760 my ($self) = @_;
1761
1762 # TODO: use animation
1763 if ($self->{state} = !$self->{state}) {
1764 $CFClient::UI::TOPLEVEL->add ($self->{other});
1765 $self->{other}->move (
1766 ($::WIDTH - $self->{other}{w}) * 0.5,
1767 ($::HEIGHT - $self->{other}{h}) * 0.5,
1768 );
1769 } else {
1770 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1771 }
1772}
1773
1774#############################################################################
1775
1657package CFClient::UI::Toplevel; 1776package CFClient::UI::Toplevel;
1658 1777
1659our @ISA = CFClient::UI::Container::; 1778our @ISA = CFClient::UI::Container::;
1660 1779
1661sub size_request { 1780sub size_request {

Diff Legend

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