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.121 by root, Mon Apr 17 19:21:00 2006 UTC vs.
Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC

… …
112 $self 112 $self
113} 113}
114 114
115sub move { 115sub move {
116 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
117
117 $self->{x} = int $x; 118 $self->{x} = int $x;
118 $self->{y} = int $y; 119 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 120 $self->{z} = $z if defined $z;
121
122 $self->update;
120} 123}
121 124
122sub needs_redraw { 125sub needs_redraw {
123 0 126 0
124} 127}
… …
126sub size_request { 129sub size_request {
127 require Carp; 130 require Carp;
128 Carp::confess "size_request is abtract"; 131 Carp::confess "size_request is abtract";
129} 132}
130 133
131sub _size_allocate { 134sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 135 my ($self, $x, $y, $w, $h) = @_;
133 136
134 $self->{x} = $x; 137 $self->{x} = $x;
135 $self->{y} = $y; 138 $self->{y} = $y;
136 139
137 return unless $self->{w} != $w || $self->{h} != $h; 140 return unless $self->{w} != $w || $self->{h} != $h;
138 141
139 $self->{w} = $w; 142 $self->{w} = $w;
140 $self->{h} = $h; 143 $self->{h} = $h;
141 144
142 1 145 $self->size_allocate ($w, $h);
143} 146}
144 147
145sub size_allocate { 148sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_; 149 # nothing to be done
147
148 $self->_size_allocate ($x, $y, $w, $h);
149} 150}
150 151
151# return top left coordinates 152# return top left coordinates
152sub _topleft { 153sub _topleft {
153 my ($self, $x, $y) = @_; 154 my ($self, $x, $y) = @_;
… …
225 glPopMatrix; 226 glPopMatrix;
226 227
227 if ($self == $HOVER && $self->{can_hover}) { 228 if ($self == $HOVER && $self->{can_hover}) {
228 my ($x, $y) = @$self{qw(x y)}; 229 my ($x, $y) = @$self{qw(x y)};
229 230
230 glColor 0, 0, 1, 0.2; 231 glColor 1, 0.8, 0.5, 0.2;
231 glEnable GL_BLEND; 232 glEnable GL_BLEND;
232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 233 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
233 glBegin GL_QUADS; 234 glBegin GL_QUADS;
234 glVertex $x , $y; 235 glVertex $x , $y;
235 glVertex $x + $self->{w}, $y; 236 glVertex $x + $self->{w}, $y;
… …
260 my ($self, $parent) = @_; 261 my ($self, $parent) = @_;
261 262
262 Scalar::Util::weaken ($self->{parent} = $parent); 263 Scalar::Util::weaken ($self->{parent} = $parent);
263} 264}
264 265
266sub check_size {
267 my ($self) = @_;
268
269 my ($w, $h) = $self->size_request;
270
271 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w;
273 $self->{req_h} = $h;
274
275 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 }
281}
282
265sub update { 283sub update {
266 my ($self) = @_; 284 my ($self) = @_;
267 285
268 $self->{parent}->update 286 $self->{parent}->update
269 if $self->{parent}; 287 if $self->{parent};
… …
368 sort { $a->{z} <=> $b->{z} } 386 sort { $a->{z} <=> $b->{z} }
369 @{$self->{children}}, $child 387 @{$self->{children}}, $child
370 ]; 388 ];
371 389
372 $self->{w} = $self->{h} = -1; 390 $self->{w} = $self->{h} = -1;
373 $self->update; 391
392 $child->check_size;
374} 393}
375 394
376sub remove { 395sub remove {
377 my ($self, $widget) = @_; 396 my ($self, $widget) = @_;
378 397
379 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 398 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
380 399
381 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 400 $self->check_size;
382} 401}
383 402
384sub find_widget { 403sub find_widget {
385 my ($self, $x, $y) = @_; 404 my ($self, $x, $y) = @_;
386 405
… …
439sub size_request { 458sub size_request {
440 $_[0]{children}[0]->size_request 459 $_[0]{children}[0]->size_request
441} 460}
442 461
443sub size_allocate { 462sub size_allocate {
444 my ($self, $x, $y, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
445 464
446 $self->_size_allocate ($x, $y, $w, $h) or return;
447
448 $self->{children}[0]->size_allocate (0, 0, $w, $h); 465 $self->{children}[0]->configure (0, 0, $w, $h);
449} 466}
450 467
451############################################################################# 468#############################################################################
452 469
453package CFClient::UI::Window; 470package CFClient::UI::Window;
… …
479 $self->child->draw; 496 $self->child->draw;
480 }; 497 };
481} 498}
482 499
483sub size_allocate { 500sub size_allocate {
484 my ($self, $x, $y, $w, $h) = @_; 501 my ($self, $w, $h) = @_;
485 502
486 $self->_size_allocate ($x, $y, $w, $h) or return;
487
488 $self->child->size_allocate (0, 0, $w, $h); 503 $self->child->configure (0, 0, $w, $h);
489 504
490 $self->render_chld; 505 $self->render_chld;
491} 506}
492 507
493sub _draw { 508sub _draw {
… …
509 glDisable GL_TEXTURE_2D; 524 glDisable GL_TEXTURE_2D;
510} 525}
511 526
512############################################################################# 527#############################################################################
513 528
529package CFClient::UI::ViewPort;
530
531our @ISA = CFClient::UI::Window::;
532
533sub new { die }
534
535sub size_request {
536 my ($self) = @_;
537
538 @$self{qw(child_w child_h)} = $self->child->size_request;
539 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540
541 @$self{qw(child_w child_h)}
542}
543
544sub _draw {
545 my ($self) = @_;
546
547 $self->{children}[1]->draw;
548}
549
550
551#############################################################################
552
514package CFClient::UI::Frame; 553package CFClient::UI::Frame;
515 554
516our @ISA = CFClient::UI::Bin::; 555our @ISA = CFClient::UI::Bin::;
517 556
518use SDL::OpenGL; 557use SDL::OpenGL;
… …
528} 567}
529 568
530sub size_allocate { 569sub size_allocate {
531 my ($self, $x, $y, $w, $h) = @_; 570 my ($self, $x, $y, $w, $h) = @_;
532 571
533 $self->_size_allocate ($x, $y, $w, $h) or return;
534
535 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 572 $self->child->configure (2, 2, $w - 4, $h - 4);
536} 573}
537 574
538sub _draw { 575sub _draw {
539 my ($self) = @_; 576 my ($self) = @_;
540 577
… …
590 $h + $self->{border} * 2, 627 $h + $self->{border} * 2,
591 ) 628 )
592} 629}
593 630
594sub size_allocate { 631sub size_allocate {
595 my ($self, $x, $y, $w, $h) = @_; 632 my ($self, $w, $h) = @_;
596
597 $self->_size_allocate ($x, $y, $w, $h) or return;
598 633
599 $h -= List::Util::max 0, $self->{border} * 2; 634 $h -= List::Util::max 0, $self->{border} * 2;
600 $w -= List::Util::max 0, $self->{border} * 2; 635 $w -= List::Util::max 0, $self->{border} * 2;
601 636
602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 637 $self->child->configure ($self->{border}, $self->{border}, $w, $h);
603} 638}
604 639
605sub button_down { 640sub button_down {
606 my ($self, $ev, $x, $y) = @_; 641 my ($self, $ev, $x, $y) = @_;
607 642
… …
616 651
617 ($x, $y) = ($ev->motion_x, $ev->motion_y); 652 ($x, $y) = ($ev->motion_x, $ev->motion_y);
618 653
619 $self->{user_w} = $bw + $x - $ox; 654 $self->{user_w} = $bw + $x - $ox;
620 $self->{user_h} = $bh + $y - $oy; 655 $self->{user_h} = $bh + $y - $oy;
621 $self->update; 656 $self->check_size;
622 }; 657 };
623 658
624 } elsif ($x >= 0 && $x < $self->{w} 659 } elsif ($x >= 0 && $x < $self->{w}
625 && $y >= 0 && $y < $self->{border}) { 660 && $y >= 0 && $y < $self->{border}) {
626 661
… …
710 745
711 $child->set_parent ($self); 746 $child->set_parent ($self);
712 $self->{children}[$y][$x] = $child; 747 $self->{children}[$y][$x] = $child;
713 748
714 $self->{w} = $self->{h} = -1; 749 $self->{w} = $self->{h} = -1;
715 $self->update; 750
751 $child->check_size;
716} 752}
717 753
718# TODO: move to container class maybe? send childs a signal on removal? 754# TODO: move to container class maybe? send childs a signal on removal?
719sub clear { 755sub clear {
720 my ($self) = @_; 756 my ($self) = @_;
… …
755 (sum @$hs), 791 (sum @$hs),
756 ) 792 )
757} 793}
758 794
759sub size_allocate { 795sub size_allocate {
760 my ($self, $x, $y, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
761
762 $self->_size_allocate ($x, $y, $w, $h) or return;
763 797
764 my ($ws, $hs) = $self->get_wh; 798 my ($ws, $hs) = $self->get_wh;
765 799
766 my $req_w = sum @$ws; 800 my $req_w = sum @$ws;
767 my $req_h = sum @$hs; 801 my $req_h = sum @$hs;
… …
789 823
790 for my $c (0 .. $#$row) { 824 for my $c (0 .. $#$row) {
791 my $col_w = $ws->[$c]; 825 my $col_w = $ws->[$c];
792 826
793 if (my $widget = $row->[$c]) { 827 if (my $widget = $row->[$c]) {
794 $widget->size_allocate ($x, $y, $col_w, $row_h); 828 $widget->configure ($x, $y, $col_w, $row_h);
795 } 829 }
796 830
797 $x += $col_w; 831 $x += $col_w;
798 } 832 }
799 833
… …
844 (List::Util::max map $_->[1], @alloc), 878 (List::Util::max map $_->[1], @alloc),
845 ) 879 )
846} 880}
847 881
848sub size_allocate { 882sub size_allocate {
849 my ($self, $x, $y, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
850
851 $self->_size_allocate ($x, $y, $w, $h);
852 884
853 ($h, $w) = ($w, $h); 885 ($h, $w) = ($w, $h);
854 886
855 my $children = $self->{children}; 887 my $children = $self->{children};
856 888
… …
878 910
879 my $y = 0; 911 my $y = 0;
880 for (0 .. $#$children) { 912 for (0 .. $#$children) {
881 my $child = $children->[$_]; 913 my $child = $children->[$_];
882 my $h = $h[$_]; 914 my $h = $h[$_];
883 $child->size_allocate ($y, 0, $h, $w); 915 $child->configure ($y, 0, $h, $w);
884 916
885 $y += $h; 917 $y += $h;
886 } 918 }
919
920 1
887} 921}
888 922
889############################################################################# 923#############################################################################
890 924
891package CFClient::UI::VBox; 925package CFClient::UI::VBox;
… …
904 (List::Util::sum map $_->[1], @alloc), 938 (List::Util::sum map $_->[1], @alloc),
905 ) 939 )
906} 940}
907 941
908sub size_allocate { 942sub size_allocate {
909 my ($self, $x, $y, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
910
911 $self->_size_allocate ($x, $y, $w, $h);
912 944
913 my $children = $self->{children}; 945 my $children = $self->{children};
914 946
915 my @h = map +($_->size_request)[1], @$children; 947 my @h = map +($_->size_request)[1], @$children;
916 948
… …
934 966
935 my $y = 0; 967 my $y = 0;
936 for (0 .. $#$children) { 968 for (0 .. $#$children) {
937 my $child = $children->[$_]; 969 my $child = $children->[$_];
938 my $h = $h[$_]; 970 my $h = $h[$_];
939 $child->size_allocate (0, $y, $w, $h); 971 $child->configure (0, $y, $w, $h);
940 972
941 $y += $h; 973 $y += $h;
942 } 974 }
975
976 1
943} 977}
944 978
945############################################################################# 979#############################################################################
946 980
947package CFClient::UI::Label; 981package CFClient::UI::Label;
… …
1013 $h + $self->{padding} * 2, 1047 $h + $self->{padding} * 2,
1014 ) 1048 )
1015} 1049}
1016 1050
1017sub size_allocate { 1051sub size_allocate {
1018 my ($self, $x, $y, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
1019
1020 $self->_size_allocate ($x, $y, $w, $h) or return;
1021 1053
1022 delete $self->{texture}; 1054 delete $self->{texture};
1023} 1055}
1024 1056
1025sub update { 1057sub update {
… …
1043 glEnable GL_TEXTURE_2D; 1075 glEnable GL_TEXTURE_2D;
1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1076 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1045 1077
1046 glColor @{$self->{fg}}; 1078 glColor @{$self->{fg}};
1047 1079
1048 my $x = 1080 $self->{ox} = int (
1049 $self->{align} < 0 ? $self->{padding} 1081 $self->{align} < 0 ? $self->{padding}
1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1082 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1051 : ($self->{w} - $tex->{w}) * 0.5; 1083 : ($self->{w} - $tex->{w}) * 0.5
1084 );
1052 1085
1053 my $y = 1086 $self->{oy} = int (
1054 $self->{valign} < 0 ? $self->{padding} 1087 $self->{valign} < 0 ? $self->{padding}
1055 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1088 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1056 : ($self->{h} - $tex->{h}) * 0.5; 1089 : ($self->{h} - $tex->{h}) * 0.5
1090 );
1057 1091
1058 $tex->draw_quad (int $x, int $y); 1092 $tex->draw_quad ($self->{ox}, $self->{oy});
1059 1093
1060 glDisable GL_TEXTURE_2D; 1094 glDisable GL_TEXTURE_2D;
1061 glDisable GL_BLEND; 1095 glDisable GL_BLEND;
1062} 1096}
1063 1097
… …
1112 1146
1113 ($w + 1, $h) # add 1 for cursor 1147 ($w + 1, $h) # add 1 for cursor
1114} 1148}
1115 1149
1116sub size_allocate { 1150sub size_allocate {
1117 my ($self, $x, $y, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1118
1119 $self->SUPER::size_allocate ($x, $y, $w, $h);
1120 1152
1121 $self->_set_text ($self->{text}); 1153 $self->_set_text ($self->{text});
1122} 1154}
1123 1155
1124sub set_text { 1156sub set_text {
… …
1224 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 1256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1225 } 1257 }
1226 1258
1227 glColor @{$self->{fg}}; 1259 glColor @{$self->{fg}};
1228 glBegin GL_LINES; 1260 glBegin GL_LINES;
1229 glVertex $self->{cur_x}, $self->{cur_y};
1230 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1261 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1262 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1231 glEnd; 1263 glEnd;
1232 } 1264 }
1233} 1265}
1234 1266
1235package CFClient::UI::Entry; 1267package CFClient::UI::Entry;
… …
1272 1304
1273 $class->SUPER::new ( 1305 $class->SUPER::new (
1274 padding => 4, 1306 padding => 4,
1275 fg => [1, 1, 1], 1307 fg => [1, 1, 1],
1276 bg => [1, 1, 1, 0.2], 1308 bg => [1, 1, 1, 0.2],
1277 active_fg => [1, 1, 0], 1309 active_fg => [0, 0, 1],
1278 can_hover => 1, 1310 can_hover => 1,
1311 align => 0,
1312 valign => 0,
1279 @_ 1313 @_
1280 ) 1314 )
1281} 1315}
1282 1316
1283sub button_up { 1317sub button_up {
… …
1342 my ($self) = @_; 1376 my ($self) = @_;
1343 1377
1344 ($self->{padding} * 2 + 6) x 2 1378 ($self->{padding} * 2 + 6) x 2
1345} 1379}
1346 1380
1347sub size_allocate {
1348 my ($self, $x, $y, $w, $h) = @_;
1349
1350 $self->_size_allocate ($x, $y, $w, $h);
1351}
1352
1353sub button_down { 1381sub button_down {
1354 my ($self, $ev, $x, $y) = @_; 1382 my ($self, $ev, $x, $y) = @_;
1355 1383
1356 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1384 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1357 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1385 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1379 1407
1380 $tex->draw_quad (0, 0, $s, $s); 1408 $tex->draw_quad (0, 0, $s, $s);
1381 1409
1382 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1383 glDisable GL_BLEND; 1411 glDisable GL_BLEND;
1412}
1413
1414#############################################################################
1415
1416package CFClient::UI::VGauge;
1417
1418our @ISA = CFClient::UI::Base::;
1419
1420use SDL::OpenGL;
1421
1422my %tex = (
1423 food => [
1424 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426 ],
1427 grace => [
1428 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1429 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1430 ],
1431 hp => [
1432 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1433 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434 ],
1435 mana => [
1436 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1437 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1438 ],
1439);
1440
1441# eg. VGauge->new (gauge => 'food'), default gauge: food
1442sub new {
1443 my $class = shift;
1444
1445 my $self = $class->SUPER::new (gauge => 'food', @_);
1446
1447 $self
1448}
1449
1450sub size_request {
1451 my ($self) = @_;
1452
1453 my $tex = $tex{$self->{gauge}}[0];
1454
1455 @$tex{qw(w h)}
1456}
1457
1458sub set_max {
1459 my ($self, $max) = @_;
1460
1461 $self->{max_val} = $max;
1462}
1463
1464sub set_value {
1465 my ($self, $val, $max) = @_;
1466
1467 $self->set_max ($max)
1468 if defined $max;
1469
1470 $max = $self->{max_val};
1471 $self->{val} = $val;
1472
1473 $self->update;
1474}
1475
1476sub _draw {
1477 my ($self) = @_;
1478
1479 my $tex = $tex{$self->{gauge}};
1480
1481 my ($w, $h) = ($self->{w}, $self->{h});
1482
1483 my $ycut = $self->{val} / ($self->{max_val} || 1);
1484 $ycut = 1 if $self->{val} > $self->{max_val};
1485
1486 my $t1 = $tex->[0];
1487 my $t2 = $tex->[1];
1488
1489 glEnable GL_BLEND;
1490 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491 glEnable GL_TEXTURE_2D;
1492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493
1494 my $h1 = $self->{h} - $ycut * $self->{h};
1495 my $h2 = $ycut * $self->{h};
1496
1497 my $yp = 0;
1498
1499 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1500 glBegin (GL_QUADS);
1501 glTexCoord (0, 0); glVertex (0 , $yp);
1502 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1503 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1504 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1505 glEnd ();
1506
1507 $yp += $h1;
1508
1509 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1510 glBegin (GL_QUADS);
1511 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1512 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1513 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1514 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1515 glEnd ();
1516
1517 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D;
1384} 1519}
1385 1520
1386############################################################################# 1521#############################################################################
1387 1522
1388package CFClient::UI::Slider; 1523package CFClient::UI::Slider;
… …
1582 1717
1583 ($self->{req_w}, $self->{req_h}) 1718 ($self->{req_w}, $self->{req_h})
1584} 1719}
1585 1720
1586sub size_allocate { 1721sub size_allocate {
1587 my ($self, $x, $y, $w, $h) = @_; 1722 my ($self, $w, $h) = @_;
1588
1589 $self->SUPER::size_allocate ($x, $y, $w, $h);
1590 1723
1591 $self->{layout}->set_height ($self->{fontsize}); 1724 $self->{layout}->set_height ($self->{fontsize});
1592 $self->{layout}->set_width ($self->{w}); 1725 $self->{layout}->set_width ($self->{w});
1593 1726
1594 $self->reflow; 1727 $self->reflow;
1728 $self->update;
1595} 1729}
1596 1730
1597sub add_paragraph { 1731sub add_paragraph {
1598 my ($self, $color, $text) = @_; 1732 my ($self, $color, $text) = @_;
1599 1733
… …
1780 1914
1781 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 1915 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1782 1916
1783 if ($::CFG->{fow_enable}) { 1917 if ($::CFG->{fow_enable}) {
1784 if ($::CFG->{fow_smooth}) { # smooth fog of war 1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1785 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1786 glConvolutionFilter2D 1920 glConvolutionFilter2D (
1787 GL_CONVOLUTION_2D, 1921 GL_CONVOLUTION_2D,
1788 GL_ALPHA, 1922 GL_ALPHA,
1789 3, 3, 1923 3, 3,
1790 GL_ALPHA, GL_FLOAT, 1924 GL_ALPHA, GL_FLOAT,
1791 pack "f*", 1925 pack "f*",
1792 0.1, 0.1, 0.1, 1926 0.1, 0.1, 0.1,
1793 0.1, 0.2, 0.1, 1927 0.1, 0.2, 0.1,
1794 0.1, 0.1, 0.1, 1928 0.1, 0.1, 0.1,
1795 ; 1929 );
1796 glEnable GL_CONVOLUTION_2D; 1930 glEnable GL_CONVOLUTION_2D;
1797 } 1931 }
1798 1932
1799 $self->{fow_texture} = new CFClient::Texture 1933 $self->{fow_texture} = new CFClient::Texture
1800 w => $w, 1934 w => $w,
… …
1830 $self->{mapmap_texture} = 1964 $self->{mapmap_texture} =
1831 new CFClient::Texture 1965 new CFClient::Texture
1832 w => $w, 1966 w => $w,
1833 h => $h, 1967 h => $h,
1834 data => $::MAP->mapmap ($w, $h), 1968 data => $::MAP->mapmap ($w, $h),
1835 type => GL_UNSIGNED_INT_8_8_8_8_REV; 1969 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1836 1970
1837 $self->{mapmap_texture}->draw_quad (100, 100); 1971 $self->{mapmap_texture}->draw_quad (100, 100);
1838 1972
1839 glDisable GL_TEXTURE_2D; 1973 glDisable GL_TEXTURE_2D;
1840 glDisable GL_BLEND; 1974 glDisable GL_BLEND;
… …
1884 2018
1885 my $mod = $ev->key_mod; 2019 my $mod = $ev->key_mod;
1886 my $sym = $ev->key_sym; 2020 my $sym = $ev->key_sym;
1887 2021
1888 if ($sym == SDLK_KP5) { 2022 if ($sym == SDLK_KP5) {
1889 $::CONN->user_send ("command stay fire"); 2023 $::CONN->user_send ("stay fire");
1890 } elsif ($sym == SDLK_a) { 2024 } elsif ($sym == SDLK_a) {
1891 $::CONN->user_send ("command apply"); 2025 $::CONN->user_send ("apply");
1892 } elsif ($sym == SDLK_QUOTE) { 2026 } elsif ($sym == SDLK_QUOTE) {
1893 $self->emit ('activate_console'); 2027 $self->emit ('activate_console');
1894 } elsif ($sym == SDLK_SLASH) { 2028 } elsif ($sym == SDLK_SLASH) {
1895 $self->emit ('activate_console' => '/'); 2029 $self->emit ('activate_console' => '/');
1896 } elsif (exists $DIR{$sym}) { 2030 } elsif (exists $DIR{$sym}) {
1897 if ($mod & KMOD_SHIFT) { 2031 if ($mod & KMOD_SHIFT) {
1898 $self->{shft}++; 2032 $self->{shft}++;
1899 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
1900 } elsif ($mod & KMOD_CTRL) { 2034 } elsif ($mod & KMOD_CTRL) {
1901 $self->{ctrl}++; 2035 $self->{ctrl}++;
1902 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2036 $::CONN->user_send ("run $DIR{$sym}[0]");
1903 } else { 2037 } else {
1904 $::CONN->user_send ("command $DIR{$sym}[1]"); 2038 $::CONN->user_send ("$DIR{$sym}[1]");
1905 } 2039 }
1906 } 2040 }
1907} 2041}
1908 2042
1909sub key_up { 2043sub key_up {
… …
1911 2045
1912 my $mod = $ev->key_mod; 2046 my $mod = $ev->key_mod;
1913 my $sym = $ev->key_sym; 2047 my $sym = $ev->key_sym;
1914 2048
1915 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1916 $::CONN->user_send ("command fire_stop"); 2050 $::CONN->user_send ("fire_stop");
1917 } 2051 }
1918 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1919 $::CONN->user_send ("command run_stop"); 2053 $::CONN->user_send ("run_stop");
1920 } 2054 }
1921} 2055}
1922 2056
1923############################################################################# 2057#############################################################################
1924 2058
… …
2007 2141
2008our @ISA = CFClient::UI::Container::; 2142our @ISA = CFClient::UI::Container::;
2009 2143
2010use SDL::OpenGL; 2144use SDL::OpenGL;
2011 2145
2146sub check_size {
2147 my ($self) = @_;
2148
2149 $self->configure (0, 0, $::WITH, $::HEIGHT);
2150}
2151
2012sub size_request { 2152sub size_request {
2013 ($::WIDTH, $::HEIGHT) 2153 ($::WIDTH, $::HEIGHT)
2014} 2154}
2015 2155
2016sub size_allocate { 2156sub configure {
2017 my ($self, $x, $y, $w, $h) = @_; 2157 my ($self, $x, $y, $w, $h) = @_;
2018 2158
2019 $self->_size_allocate ($x, $y, $w, $h); 2159 $self->SUPER::configure ($x, $y, $w, $h);
2020 2160
2021 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2161 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2022 for @{$self->{children}}; 2162 for @{$self->{children}};
2023} 2163}
2024 2164
2025sub _topleft { 2165sub _topleft {
2026 my ($self, $x, $y) = @_; 2166 my ($self, $x, $y) = @_;
… …
2029} 2169}
2030 2170
2031sub update { 2171sub update {
2032 my ($self) = @_; 2172 my ($self) = @_;
2033 2173
2034 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2174 $self->check_size;
2035 ::refresh (); 2175 ::refresh ();
2036} 2176}
2037 2177
2038sub add { 2178sub add {
2039 my ($self, $widget) = @_; 2179 my ($self, $child) = @_;
2040 2180
2041 $self->SUPER::add ($widget); 2181 $self->SUPER::add ($child);
2042
2043 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2044} 2182}
2045 2183
2046sub on_refresh { 2184sub on_refresh {
2047 my ($self, $id, $cb) = @_; 2185 my ($self, $id, $cb) = @_;
2048 2186

Diff Legend

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