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.83 by root, Wed Apr 12 12:16:58 2006 UTC vs.
Revision 1.91 by root, Wed Apr 12 23:15:39 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
… …
997 my $x = 993 my $x =
998 $self->{align} < 0 ? $self->{padding} 994 $self->{align} < 0 ? $self->{padding}
999 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1000 : ($self->{w} - $tex->{w}) * 0.5; 996 : ($self->{w} - $tex->{w}) * 0.5;
1001 997
1002 glTranslate $x, $self->{padding}, 0; 998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
1003 $tex->draw_quad (0, 0); 999 $tex->draw_quad (0, 0);
1004 1000
1005 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1007} 1003}
… …
1170our @ISA = CFClient::UI::Label::; 1166our @ISA = CFClient::UI::Label::;
1171 1167
1172use SDL; 1168use SDL;
1173use SDL::OpenGL; 1169use SDL::OpenGL;
1174 1170
1171my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png);
1174
1175sub new { 1175sub new {
1176 my $class = shift; 1176 my $class = shift;
1177 1177
1178 $class->SUPER::new ( 1178 $class->SUPER::new (
1179 padding => 4, 1179 padding => 4,
1180 fg => [1, 1, 1], 1180 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1181 bg => [1, 1, 1, 0.2],
1182 active_bg => [0, 0, 0, 0.5],
1183 active_fg => [1, 1, 0], 1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5],
1184 border_fg => [1, 1, 0], 1184# border_fg => [1, 1, 0],
1185 @_ 1185 @_
1186 ) 1186 )
1187} 1187}
1188 1188
1189sub button_up { 1189sub button_up {
… …
1197 1197
1198sub _draw { 1198sub _draw {
1199 my ($self) = @_; 1199 my ($self) = @_;
1200 1200
1201 local $self->{fg} = $self->{fg}; 1201 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
1202 1203
1203 glEnable GL_BLEND; 1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 1207
1206 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly 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} };
1207 1276
1208 glBegin GL_LINE_LOOP; 1277 glBegin GL_LINE_LOOP;
1209 glColor @{$self->{border_fg}}; 1278 glVertex 0 , 0;
1210 glVertex 1 , 1; 1279 glVertex 0 , $s;
1211 glVertex 1 , $self->{h} - 2; 1280 glVertex $s, $s;
1212 glVertex $self->{w} - 2, $self->{h} - 2; 1281 glVertex $s, 0;
1213 glVertex $self->{w} - 2, 1;
1214 glEnd; 1282 glEnd;
1215
1216 if ($GRAB == $self) {
1217 glColor @{$self->{active_bg}};
1218 $self->{fg} = $self->{active_fg};
1219 } else {
1220 glColor @{$self->{bg}};
1221 }
1222 1283
1223 glBegin GL_QUADS; 1284 if ($self->{state}) {
1224 glVertex 2 , 2; 1285 glBegin GL_LINES;
1225 glVertex 2 , $self->{h} - 2; 1286 glVertex 0 , 0;
1226 glVertex $self->{w} - 2, $self->{h} - 2; 1287 glVertex $s, $s;
1227 glVertex $self->{w} - 2, 2; 1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1228 glEnd; 1290 glEnd;
1229 glDisable GL_BLEND; 1291 }
1230
1231 $self->SUPER::_draw;
1232} 1292}
1233 1293
1234############################################################################# 1294#############################################################################
1235 1295
1236package CFClient::UI::Slider; 1296package CFClient::UI::Slider;
… …
1423 1483
1424 glEnable GL_TEXTURE_2D; 1484 glEnable GL_TEXTURE_2D;
1425 glEnable GL_BLEND; 1485 glEnable GL_BLEND;
1426 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1427 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;
1428 1489
1429 my $sw4 = ($sw + 3) & ~3; 1490 my $sw4 = ($sw + 3) & ~3;
1430 my $darkness = "\x00" x ($sw4 * $sh); 1491 my $darkness = "\x00" x ($sw4 * $sh);
1431 1492
1432 for my $x (0 .. $sw - 1) { 1493 for my $x (0 .. $sw - 1) {
… …
1463# $lighting =~ s/(.)../$1/gs; 1524# $lighting =~ s/(.)../$1/gs;
1464# } 1525# }
1465 1526
1466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1467 1528
1529 if ($::CFG->{fow_smooth}) { # smooth fog of war
1530 my @conv = (
1531 0.05, 0.05, 0.05,
1532 0.05, 0.60, 0.05,
1533 0.05, 0.05, 0.05,
1534 );
1535 CFClient::glConvolutionParameteri GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_REPLICATE_BORDER;
1536 CFClient::glConvolutionFilter2D GL_CONVOLUTION_2D,
1537 GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT,
1538 pack "f*", @conv;
1539 glEnable GL_CONVOLUTION_2D;
1540 }
1541
1468 $darkness = new CFClient::Texture 1542 $darkness = new CFClient::Texture
1469 w => $sw4, 1543 w => $sw4,
1470 h => $sh, 1544 h => $sh,
1471 data => $darkness, 1545 data => $darkness,
1472 internalformat => GL_ALPHA, 1546 internalformat => GL_ALPHA,
1473 format => GL_ALPHA; 1547 format => GL_ALPHA;
1474 1548
1475 glColor 0.45, 0.45, 0.45, 1; 1549 glColor +($::CFG->{fow_intensity}) x 3, 1;
1476 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1550 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1551
1552 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1477 1553
1478 glDisable GL_TEXTURE_2D; 1554 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND; 1555 glDisable GL_BLEND;
1480 1556
1481 glEndList; 1557 glEndList;
1482 } 1558 }
1483 1559
1484 glCallList $self->{list}; 1560 glCallList $self->{list};
1561
1562 if ($FOCUS != $self) {
1563 glEnable GL_BLEND;
1564 glColor 0, 0, 1, 0.4;
1565 glBegin GL_QUADS;
1566 glVertex 0, 0;
1567 glVertex 0, $::HEIGHT;
1568 glVertex $::WIDTH, $::HEIGHT;
1569 glVertex $::WIDTH, 0;
1570 glEnd;
1571 glDisable GL_BLEND;
1572 }
1485} 1573}
1486 1574
1487my %DIR = ( 1575my %DIR = (
1488 SDLK_KP8, [1, "north"], 1576 SDLK_KP8, [1, "north"],
1489 SDLK_KP9, [2, "northeast"], 1577 SDLK_KP9, [2, "northeast"],
… …
1505 1593
1506 my $mod = $ev->key_mod; 1594 my $mod = $ev->key_mod;
1507 my $sym = $ev->key_sym; 1595 my $sym = $ev->key_sym;
1508 1596
1509 if ($sym == SDLK_KP5) { 1597 if ($sym == SDLK_KP5) {
1510 $::CONN->send ("command stay fire"); 1598 $::CONN->user_send ("command stay fire");
1599 } elsif ($sym == SDLK_a) {
1600 $::CONN->user_send ("command apply");
1511 } elsif (exists $DIR{$sym}) { 1601 } elsif (exists $DIR{$sym}) {
1512 if ($mod & KMOD_SHIFT) { 1602 if ($mod & KMOD_SHIFT) {
1513 $self->{shft}++; 1603 $self->{shft}++;
1514 $::CONN->send ("command fire $DIR{$sym}[0]"); 1604 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1515 } elsif ($mod & KMOD_CTRL) { 1605 } elsif ($mod & KMOD_CTRL) {
1516 $self->{ctrl}++; 1606 $self->{ctrl}++;
1517 $::CONN->send ("command run $DIR{$sym}[0]"); 1607 $::CONN->user_send ("command run $DIR{$sym}[0]");
1518 } else { 1608 } else {
1519 $::CONN->send ("command $DIR{$sym}[1]"); 1609 $::CONN->user_send ("command $DIR{$sym}[1]");
1520 } 1610 }
1521 } 1611 }
1522} 1612}
1523 1613
1524sub key_up { 1614sub key_up {
… …
1526 1616
1527 my $mod = $ev->key_mod; 1617 my $mod = $ev->key_mod;
1528 my $sym = $ev->key_sym; 1618 my $sym = $ev->key_sym;
1529 1619
1530 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1620 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1531 $::CONN->send ("command fire_stop"); 1621 $::CONN->user_send ("command fire_stop");
1532 } 1622 }
1533 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1623 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1534 $::CONN->send ("command run_stop"); 1624 $::CONN->user_send ("command run_stop");
1535 } 1625 }
1536} 1626}
1537 1627
1538############################################################################# 1628#############################################################################
1539 1629

Diff Legend

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