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.95 by root, Thu Apr 13 23:31:43 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}
… …
263 271
264 # range [value, low, high, page] 272 # range [value, low, high, page]
265 273
266 $class->SUPER::new ( 274 $class->SUPER::new (
267 bg => [0, 0, 0, 0.2], 275 bg => [0, 0, 0, 0.2],
268 active_bg => [1, 1, 1], 276 active_bg => [1, 1, 1, 0.5],
269 @_ 277 @_
270 ) 278 )
271} 279}
272 280
273sub _draw { 281sub _draw {
… …
629 637
630 my $bg = $tex[0]; 638 my $bg = $tex[0];
631 639
632 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 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 642
637 my $rep_x = $cw / $bg->{w}; 643 my $rep_x = $cw / $bg->{w};
638 my $rep_y = $ch / $bg->{h}; 644 my $rep_y = $ch / $bg->{h};
639 645
640 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
… …
735 741
736 my $x = 0; 742 my $x = 0;
737 my $row_h = $hs->[$r]; 743 my $row_h = $hs->[$r];
738 744
739 for my $c (0 .. $#$row) { 745 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 746 my $col_w = $ws->[$c];
744 747
748 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
746 751
747 $x += $col_w; 752 $x += $col_w;
748 } 753 }
749 754
750 $y += $row_h; 755 $y += $row_h;
… …
796} 801}
797 802
798sub size_allocate { 803sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 804 my ($self, $x, $y, $w, $h) = @_;
800 805
801 $self->_size_allocate ($x, $y, $w, $h) or return; 806 $self->_size_allocate ($x, $y, $w, $h);
802
803 return unless $self->{w};
804 807
805 ($h, $w) = ($w, $h); 808 ($h, $w) = ($w, $h);
806 809
807 my $children = $self->{children}; 810 my $children = $self->{children};
808 811
… …
856} 859}
857 860
858sub size_allocate { 861sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 862 my ($self, $x, $y, $w, $h) = @_;
860 863
861 $self->_size_allocate ($x, $y, $w, $h) or return; 864 $self->_size_allocate ($x, $y, $w, $h);
862
863 return unless $self->{h};
864 865
865 my $children = $self->{children}; 866 my $children = $self->{children};
866 867
867 my @h = map +($_->size_request)[1], @$children; 868 my @h = map +($_->size_request)[1], @$children;
868 869
… …
933 934
934 $self->{text} = $text; 935 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 936 $self->{layout}->set_markup ($text);
936 937
937 delete $self->{texture}; 938 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
938 $self->update; 940 $self->update;
939} 941}
940 942
941sub get_text { 943sub get_text {
942 my ($self, $text) = @_; 944 my ($self, $text) = @_;
… …
975sub _draw { 977sub _draw {
976 my ($self) = @_; 978 my ($self) = @_;
977 979
978 my $tex = $self->{texture} ||= do { 980 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 981 $self->{layout}->set_width ($self->{w});
980 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
981 new_from_layout CFClient::Texture $self->{layout} 983 new_from_layout CFClient::Texture $self->{layout}
982 }; 984 };
983 985
984 glEnable GL_BLEND; 986 glEnable GL_BLEND;
985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
991 my $x = 993 my $x =
992 $self->{align} < 0 ? $self->{padding} 994 $self->{align} < 0 ? $self->{padding}
993 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994 : ($self->{w} - $tex->{w}) * 0.5; 996 : ($self->{w} - $tex->{w}) * 0.5;
995 997
996 $tex->draw_quad ($x, $self->{padding}); 998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
999 $tex->draw_quad (0, 0);
997 1000
998 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1000} 1003}
1001 1004
… …
1012 my $class = shift; 1015 my $class = shift;
1013 1016
1014 $class->SUPER::new ( 1017 $class->SUPER::new (
1015 fg => [1, 1, 1], 1018 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2], 1019 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1], 1020 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1021 active_fg => [0, 0, 0],
1019 @_ 1022 @_
1020 ) 1023 )
1021} 1024}
1022 1025
… …
1025 1028
1026 $self->{last_activity} = $::NOW; 1029 $self->{last_activity} = $::NOW;
1027 1030
1028 $self->{text} = $text; 1031 $self->{text} = $text;
1029 $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});
1030 1034
1031 $text =~ s/./*/g if $self->{hidden}; 1035 $text =~ s/./*/g if $self->{hidden};
1032 1036
1033 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1037 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1034 1038
… …
1155 } 1159 }
1156} 1160}
1157 1161
1158############################################################################# 1162#############################################################################
1159 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
1232sub new {
1233 my $class = shift;
1234
1235 $class->SUPER::new (
1236 padding => 2,
1237 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0],
1239 state => 0,
1240 @_
1241 )
1242}
1243
1244sub size_request {
1245 my ($self) = @_;
1246
1247 ($self->{padding} * 2 + 6) x 2
1248}
1249
1250sub size_allocate {
1251 my ($self, $x, $y, $w, $h) = @_;
1252
1253 $self->_size_allocate ($x, $y, $w, $h);
1254}
1255
1256sub button_down {
1257 my ($self, $ev, $x, $y) = @_;
1258
1259 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1260 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1261 $self->{state} = !$self->{state};
1262 $self->emit (changed => $self->{state});
1263 }
1264}
1265
1266sub _draw {
1267 my ($self) = @_;
1268
1269 $self->SUPER::_draw;
1270
1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276
1277 glBegin GL_LINE_LOOP;
1278 glVertex 0 , 0;
1279 glVertex 0 , $s;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283
1284 if ($self->{state}) {
1285 glBegin GL_LINES;
1286 glVertex 0 , 0;
1287 glVertex $s, $s;
1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1290 glEnd;
1291 }
1292}
1293
1294#############################################################################
1295
1160package CFClient::UI::Slider; 1296package CFClient::UI::Slider;
1161 1297
1162use strict; 1298use strict;
1163 1299
1164use SDL::OpenGL; 1300use SDL::OpenGL;
… …
1242 $value = int +($value - $lo) * $w / ($hi - $lo); 1378 $value = int +($value - $lo) * $w / ($hi - $lo);
1243 1379
1244 $w -= $page; 1380 $w -= $page;
1245 $page &= ~1; 1381 $page &= ~1;
1246 glTranslate $page * 0.5, 0, 0; 1382 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2;
1247 1384
1248 glColor @$fg; 1385 glColor @$fg;
1249 glBegin GL_LINES; 1386 glBegin GL_LINES;
1250 glVertex 0, 0; glVertex 0, $h; 1387 glVertex 0, 0; glVertex 0, $h;
1251 glVertex $w - 1, 0; glVertex $w - 1, $h; 1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
… …
1317} 1454}
1318 1455
1319sub draw { 1456sub draw {
1320 my ($self) = @_; 1457 my ($self) = @_;
1321 1458
1459 $self->{need_update}++;#d#
1322 if (delete $self->{need_update}) { 1460 if (delete $self->{need_update}) {
1323 glNewList $self->{list}, GL_COMPILE; 1461 glNewList $self->{list}, GL_COMPILE;
1324 1462
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; 1463 my $sw = int $::WIDTH / 32;
1333 my $sh = 1 + int $::HEIGHT / 32; 1464 my $sh = int $::HEIGHT / 32;
1334 1465
1335 if ($::CONN->{mapw} > $sw) { 1466 if ($::MAP) {
1336 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1467 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 1468
1341 if ($::CONN->{maph} > $sh) { 1469 if ($::CFG->{fow_enable}) {
1342 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1470 if ($::CFG->{fow_smooth}) { # smooth fog of war
1343 } else { 1471 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}; 1472 glConvolutionFilter2D
1345 } 1473 GL_CONVOLUTION_2D,
1346 1474 GL_ALPHA,
1347 glEnable GL_TEXTURE_2D; 1475 3, 3,
1348 glEnable GL_BLEND; 1476 GL_ALPHA, GL_FLOAT,
1349 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1477 pack "f*",
1350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1478 0.1, 0.1, 0.1,
1351 1479 0.1, 0.2, 0.1,
1352 my $sw4 = ($sw + 3) & ~3; 1480 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; 1481 ;
1361 1482 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 } 1483 }
1368 1484
1369 for my $num (grep $_, @$cell[1,2,3]) { 1485 my $tex = new CFClient::Texture
1370 my $tex = $::CONN->{face}[$num]{texture} || next; 1486 w => $w,
1371 1487 h => $h,
1372 my ($w, $h) = @$tex{qw(w h)}; 1488 data => $data,
1489 internalformat => GL_ALPHA,
1490 format => GL_ALPHA;
1373 1491
1374 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1492 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1375 } 1493
1494 glEnable GL_BLEND;
1495 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1497
1498 glColor +($::CFG->{fow_intensity}) x 3, 1;
1499 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1500
1501 glDisable GL_TEXTURE_2D;
1502 glDisable GL_BLEND;
1376 } 1503 }
1377 } 1504 }
1378 1505
1379# if (1) { # higher quality darkness 1506 glEndList;
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# } 1507 }
1388 1508
1389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1509 glCallList $self->{list};
1390 1510
1391 $darkness = new CFClient::Texture 1511 if ($FOCUS != $self) {
1392 w => $sw4, 1512 glEnable GL_BLEND;
1393 h => $sh, 1513 glColor 0, 0, 1, 0.4;
1394 data => $darkness, 1514 glBegin GL_QUADS;
1395 internalformat => GL_ALPHA, 1515 glVertex 0, 0;
1396 format => GL_ALPHA; 1516 glVertex 0, $::HEIGHT;
1397 1517 glVertex $::WIDTH, $::HEIGHT;
1398 glColor 0.45, 0.45, 0.45, 1; 1518 glVertex $::WIDTH, 0;
1399 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1519 glEnd;
1400
1401 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND; 1520 glDisable GL_BLEND;
1403
1404 glEndList;
1405 } 1521 }
1406
1407 glCallList $self->{list};
1408} 1522}
1409 1523
1410my %DIR = ( 1524my %DIR = (
1411 SDLK_KP8, [1, "north"], 1525 SDLK_KP8, [1, "north"],
1412 SDLK_KP9, [2, "northeast"], 1526 SDLK_KP9, [2, "northeast"],
… …
1428 1542
1429 my $mod = $ev->key_mod; 1543 my $mod = $ev->key_mod;
1430 my $sym = $ev->key_sym; 1544 my $sym = $ev->key_sym;
1431 1545
1432 if ($sym == SDLK_KP5) { 1546 if ($sym == SDLK_KP5) {
1433 $::CONN->send ("command stay fire"); 1547 $::CONN->user_send ("command stay fire");
1548 } elsif ($sym == SDLK_a) {
1549 $::CONN->user_send ("command apply");
1434 } elsif (exists $DIR{$sym}) { 1550 } elsif (exists $DIR{$sym}) {
1435 if ($mod & KMOD_SHIFT) { 1551 if ($mod & KMOD_SHIFT) {
1436 $self->{shft}++; 1552 $self->{shft}++;
1437 $::CONN->send ("command fire $DIR{$sym}[0]"); 1553 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1438 } elsif ($mod & KMOD_CTRL) { 1554 } elsif ($mod & KMOD_CTRL) {
1439 $self->{ctrl}++; 1555 $self->{ctrl}++;
1440 $::CONN->send ("command run $DIR{$sym}[0]"); 1556 $::CONN->user_send ("command run $DIR{$sym}[0]");
1441 } else { 1557 } else {
1442 $::CONN->send ("command $DIR{$sym}[1]"); 1558 $::CONN->user_send ("command $DIR{$sym}[1]");
1443 } 1559 }
1444 } 1560 }
1445} 1561}
1446 1562
1447sub key_up { 1563sub key_up {
… …
1449 1565
1450 my $mod = $ev->key_mod; 1566 my $mod = $ev->key_mod;
1451 my $sym = $ev->key_sym; 1567 my $sym = $ev->key_sym;
1452 1568
1453 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1569 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1454 $::CONN->send ("command fire_stop"); 1570 $::CONN->user_send ("command fire_stop");
1455 } 1571 }
1456 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1572 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1457 $::CONN->send ("command run_stop"); 1573 $::CONN->user_send ("command run_stop");
1458 } 1574 }
1459} 1575}
1460 1576
1461############################################################################# 1577#############################################################################
1462 1578

Diff Legend

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