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.85 by elmex, Wed Apr 12 12:55:56 2006 UTC vs.
Revision 1.93 by root, Wed Apr 12 23:59:42 2006 UTC

… …
801} 801}
802 802
803sub size_allocate { 803sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_; 804 my ($self, $x, $y, $w, $h) = @_;
805 805
806 $self->_size_allocate ($x, $y, $w, $h) or return; 806 $self->_size_allocate ($x, $y, $w, $h);
807
808 return unless $self->{w};
809 807
810 ($h, $w) = ($w, $h); 808 ($h, $w) = ($w, $h);
811 809
812 my $children = $self->{children}; 810 my $children = $self->{children};
813 811
… …
861} 859}
862 860
863sub size_allocate { 861sub size_allocate {
864 my ($self, $x, $y, $w, $h) = @_; 862 my ($self, $x, $y, $w, $h) = @_;
865 863
866 $self->_size_allocate ($x, $y, $w, $h) or return; 864 $self->_size_allocate ($x, $y, $w, $h);
867
868 return unless $self->{h};
869 865
870 my $children = $self->{children}; 866 my $children = $self->{children};
871 867
872 my @h = map +($_->size_request)[1], @$children; 868 my @h = map +($_->size_request)[1], @$children;
873 869
… …
1224 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1225} 1221}
1226 1222
1227############################################################################# 1223#############################################################################
1228 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
1229package CFClient::UI::Slider; 1296package CFClient::UI::Slider;
1230 1297
1231use strict; 1298use strict;
1232 1299
1233use SDL::OpenGL; 1300use SDL::OpenGL;
… …
1416 1483
1417 glEnable GL_TEXTURE_2D; 1484 glEnable GL_TEXTURE_2D;
1418 glEnable GL_BLEND; 1485 glEnable GL_BLEND;
1419 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488 glColor 1, 1, 1, 1;
1421 1489
1422 my $sw4 = ($sw + 3) & ~3; 1490 my $sw4 = ($sw + 3) & ~3;
1423 my $darkness = "\x00" x ($sw4 * $sh); 1491 my $darkness = "\x00" x ($sw4 * $sh);
1424 1492
1425 for my $x (0 .. $sw - 1) { 1493 for my $x (0 .. $sw - 1) {
… …
1444 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1512 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1445 } 1513 }
1446 } 1514 }
1447 } 1515 }
1448 1516
1449# if (1) { # higher quality darkness
1450# $lighting =~ s/(.)/$1$1$1/gs;
1451# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1452#
1453# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1454#
1455# $lighting = $pb->get_pixels;
1456# $lighting =~ s/(.)../$1/gs;
1457# }
1458
1459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518
1519 if ($::CFG->{fow_smooth}) { # smooth fog of war
1520 my @conv = (
1521 0.1, 0.1, 0.1,
1522 0.1, 0.2, 0.1,
1523 0.1, 0.1, 0.1,
1524 );
1525 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1526 glConvolutionFilter2D GL_CONVOLUTION_2D,
1527 GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT,
1528 pack "f*", @conv;
1529 glEnable GL_CONVOLUTION_2D;
1530 }
1460 1531
1461 $darkness = new CFClient::Texture 1532 $darkness = new CFClient::Texture
1462 w => $sw4, 1533 w => $sw4,
1463 h => $sh, 1534 h => $sh,
1464 data => $darkness, 1535 data => $darkness,
1465 internalformat => GL_ALPHA, 1536 internalformat => GL_ALPHA,
1466 format => GL_ALPHA; 1537 format => GL_ALPHA;
1467 1538
1468 glColor 0.45, 0.45, 0.45, 1; 1539 glColor +($::CFG->{fow_intensity}) x 3, 1;
1469 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1540 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1541
1542 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1470 1543
1471 glDisable GL_TEXTURE_2D; 1544 glDisable GL_TEXTURE_2D;
1472 glDisable GL_BLEND; 1545 glDisable GL_BLEND;
1473 1546
1474 glEndList; 1547 glEndList;
1475 } 1548 }
1476 1549
1477 glCallList $self->{list}; 1550 glCallList $self->{list};
1551
1552 if ($FOCUS != $self) {
1553 glEnable GL_BLEND;
1554 glColor 0, 0, 1, 0.4;
1555 glBegin GL_QUADS;
1556 glVertex 0, 0;
1557 glVertex 0, $::HEIGHT;
1558 glVertex $::WIDTH, $::HEIGHT;
1559 glVertex $::WIDTH, 0;
1560 glEnd;
1561 glDisable GL_BLEND;
1562 }
1478} 1563}
1479 1564
1480my %DIR = ( 1565my %DIR = (
1481 SDLK_KP8, [1, "north"], 1566 SDLK_KP8, [1, "north"],
1482 SDLK_KP9, [2, "northeast"], 1567 SDLK_KP9, [2, "northeast"],
… …
1498 1583
1499 my $mod = $ev->key_mod; 1584 my $mod = $ev->key_mod;
1500 my $sym = $ev->key_sym; 1585 my $sym = $ev->key_sym;
1501 1586
1502 if ($sym == SDLK_KP5) { 1587 if ($sym == SDLK_KP5) {
1503 $::CONN->send ("command stay fire"); 1588 $::CONN->user_send ("command stay fire");
1504 } elsif ($sym == SDLK_a) { 1589 } elsif ($sym == SDLK_a) {
1505 $::CONN->send ("command apply"); 1590 $::CONN->user_send ("command apply");
1506 } elsif (exists $DIR{$sym}) { 1591 } elsif (exists $DIR{$sym}) {
1507 if ($mod & KMOD_SHIFT) { 1592 if ($mod & KMOD_SHIFT) {
1508 $self->{shft}++; 1593 $self->{shft}++;
1509 $::CONN->send ("command fire $DIR{$sym}[0]"); 1594 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1510 } elsif ($mod & KMOD_CTRL) { 1595 } elsif ($mod & KMOD_CTRL) {
1511 $self->{ctrl}++; 1596 $self->{ctrl}++;
1512 $::CONN->send ("command run $DIR{$sym}[0]"); 1597 $::CONN->user_send ("command run $DIR{$sym}[0]");
1513 } else { 1598 } else {
1514 $::CONN->send ("command $DIR{$sym}[1]"); 1599 $::CONN->user_send ("command $DIR{$sym}[1]");
1515 } 1600 }
1516 } 1601 }
1517} 1602}
1518 1603
1519sub key_up { 1604sub key_up {
… …
1521 1606
1522 my $mod = $ev->key_mod; 1607 my $mod = $ev->key_mod;
1523 my $sym = $ev->key_sym; 1608 my $sym = $ev->key_sym;
1524 1609
1525 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1610 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1526 $::CONN->send ("command fire_stop"); 1611 $::CONN->user_send ("command fire_stop");
1527 } 1612 }
1528 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1613 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1529 $::CONN->send ("command run_stop"); 1614 $::CONN->user_send ("command run_stop");
1530 } 1615 }
1531} 1616}
1532 1617
1533############################################################################# 1618#############################################################################
1534 1619

Diff Legend

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