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.82 by root, Wed Apr 12 02:00:06 2006 UTC vs.
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC

… …
741 741
742 my $x = 0; 742 my $x = 0;
743 my $row_h = $hs->[$r]; 743 my $row_h = $hs->[$r];
744 744
745 for my $c (0 .. $#$row) { 745 for my $c (0 .. $#$row) {
746 my $widget = $row->[$c]
747 or next;
748
749 my $col_w = $ws->[$c]; 746 my $col_w = $ws->[$c];
750 747
748 if (my $widget = $row->[$c]) {
751 $widget->size_allocate ($x, $y, $col_w, $row_h); 749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
752 751
753 $x += $col_w; 752 $x += $col_w;
754 } 753 }
755 754
756 $y += $row_h; 755 $y += $row_h;
… …
802} 801}
803 802
804sub size_allocate { 803sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_; 804 my ($self, $x, $y, $w, $h) = @_;
806 805
807 $self->_size_allocate ($x, $y, $w, $h) or return; 806 $self->_size_allocate ($x, $y, $w, $h);
808
809 return unless $self->{w};
810 807
811 ($h, $w) = ($w, $h); 808 ($h, $w) = ($w, $h);
812 809
813 my $children = $self->{children}; 810 my $children = $self->{children};
814 811
… …
862} 859}
863 860
864sub size_allocate { 861sub size_allocate {
865 my ($self, $x, $y, $w, $h) = @_; 862 my ($self, $x, $y, $w, $h) = @_;
866 863
867 $self->_size_allocate ($x, $y, $w, $h) or return; 864 $self->_size_allocate ($x, $y, $w, $h);
868
869 return unless $self->{h};
870 865
871 my $children = $self->{children}; 866 my $children = $self->{children};
872 867
873 my @h = map +($_->size_request)[1], @$children; 868 my @h = map +($_->size_request)[1], @$children;
874 869
… …
998 my $x = 993 my $x =
999 $self->{align} < 0 ? $self->{padding} 994 $self->{align} < 0 ? $self->{padding}
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001 : ($self->{w} - $tex->{w}) * 0.5; 996 : ($self->{w} - $tex->{w}) * 0.5;
1002 997
1003 glTranslate $x, $self->{padding}, 0; 998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
1004 $tex->draw_quad (0, 0); 999 $tex->draw_quad (0, 0);
1005 1000
1006 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1008} 1003}
… …
1171our @ISA = CFClient::UI::Label::; 1166our @ISA = CFClient::UI::Label::;
1172 1167
1173use SDL; 1168use SDL;
1174use SDL::OpenGL; 1169use SDL::OpenGL;
1175 1170
1171my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png);
1174
1176sub new { 1175sub new {
1177 my $class = shift; 1176 my $class = shift;
1178 1177
1179 $class->SUPER::new ( 1178 $class->SUPER::new (
1180 padding => 4, 1179 padding => 4,
1181 fg => [1, 1, 1], 1180 fg => [1, 1, 1],
1182 bg => [1, 1, 1, 0.2], 1181 bg => [1, 1, 1, 0.2],
1183 active_bg => [0, 0, 0, 0.5],
1184 active_fg => [1, 1, 0], 1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5],
1185 border_fg => [1, 1, 0], 1184# border_fg => [1, 1, 0],
1186 @_ 1185 @_
1187 ) 1186 )
1188} 1187}
1189 1188
1190sub button_up { 1189sub button_up {
… …
1198 1197
1199sub _draw { 1198sub _draw {
1200 my ($self) = @_; 1199 my ($self) = @_;
1201 1200
1202 local $self->{fg} = $self->{fg}; 1201 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
1203 1203
1204 glEnable GL_BLEND; 1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1206 1207
1207 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} };
1208 1276
1209 glBegin GL_LINE_LOOP; 1277 glBegin GL_LINE_LOOP;
1210 glColor @{$self->{border_fg}}; 1278 glVertex 0 , 0;
1211 glVertex 1 , 1; 1279 glVertex 0 , $s;
1212 glVertex 1 , $self->{h} - 2; 1280 glVertex $s, $s;
1213 glVertex $self->{w} - 2, $self->{h} - 2; 1281 glVertex $s, 0;
1214 glVertex $self->{w} - 2, 1;
1215 glEnd; 1282 glEnd;
1216
1217 if ($GRAB == $self) {
1218 glColor @{$self->{active_bg}};
1219 $self->{fg} = $self->{active_fg};
1220 } else {
1221 glColor @{$self->{bg}};
1222 }
1223 1283
1224 glBegin GL_QUADS; 1284 if ($self->{state}) {
1225 glVertex 2 , 2; 1285 glBegin GL_LINES;
1226 glVertex 2 , $self->{h} - 2; 1286 glVertex 0 , 0;
1227 glVertex $self->{w} - 2, $self->{h} - 2; 1287 glVertex $s, $s;
1228 glVertex $self->{w} - 2, 2; 1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1229 glEnd; 1290 glEnd;
1230 glDisable GL_BLEND; 1291 }
1231
1232 $self->SUPER::_draw;
1233} 1292}
1234 1293
1235############################################################################# 1294#############################################################################
1236 1295
1237package CFClient::UI::Slider; 1296package CFClient::UI::Slider;
… …
1424 1483
1425 glEnable GL_TEXTURE_2D; 1484 glEnable GL_TEXTURE_2D;
1426 glEnable GL_BLEND; 1485 glEnable GL_BLEND;
1427 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1428 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;
1429 1489
1430 my $sw4 = ($sw + 3) & ~3; 1490 my $sw4 = ($sw + 3) & ~3;
1431 my $darkness = "\x00" x ($sw4 * $sh); 1491 my $darkness = "\x00" x ($sw4 * $sh);
1432 1492
1433 for my $x (0 .. $sw - 1) { 1493 for my $x (0 .. $sw - 1) {
… …
1471 h => $sh, 1531 h => $sh,
1472 data => $darkness, 1532 data => $darkness,
1473 internalformat => GL_ALPHA, 1533 internalformat => GL_ALPHA,
1474 format => GL_ALPHA; 1534 format => GL_ALPHA;
1475 1535
1476 glColor 0.45, 0.45, 0.45, 1; 1536 glColor +($::CFG->{fow_intensity}) x 3, 1;
1477 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1537 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1478 1538
1479 glDisable GL_TEXTURE_2D; 1539 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND; 1540 glDisable GL_BLEND;
1481 1541
1482 glEndList; 1542 glEndList;
1483 } 1543 }
1484 1544
1485 glCallList $self->{list}; 1545 glCallList $self->{list};
1546
1547 if ($FOCUS != $self) {
1548 glEnable GL_BLEND;
1549 glColor 0, 0, 1, 0.4;
1550 glBegin GL_QUADS;
1551 glVertex 0, 0;
1552 glVertex 0, $::HEIGHT;
1553 glVertex $::WIDTH, $::HEIGHT;
1554 glVertex $::WIDTH, 0;
1555 glEnd;
1556 glDisable GL_BLEND;
1557 }
1486} 1558}
1487 1559
1488my %DIR = ( 1560my %DIR = (
1489 SDLK_KP8, [1, "north"], 1561 SDLK_KP8, [1, "north"],
1490 SDLK_KP9, [2, "northeast"], 1562 SDLK_KP9, [2, "northeast"],
… …
1506 1578
1507 my $mod = $ev->key_mod; 1579 my $mod = $ev->key_mod;
1508 my $sym = $ev->key_sym; 1580 my $sym = $ev->key_sym;
1509 1581
1510 if ($sym == SDLK_KP5) { 1582 if ($sym == SDLK_KP5) {
1511 $::CONN->send ("command stay fire"); 1583 $::CONN->user_send ("command stay fire");
1584 } elsif ($sym == SDLK_a) {
1585 $::CONN->user_send ("command apply");
1512 } elsif (exists $DIR{$sym}) { 1586 } elsif (exists $DIR{$sym}) {
1513 if ($mod & KMOD_SHIFT) { 1587 if ($mod & KMOD_SHIFT) {
1514 $self->{shft}++; 1588 $self->{shft}++;
1515 $::CONN->send ("command fire $DIR{$sym}[0]"); 1589 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1516 } elsif ($mod & KMOD_CTRL) { 1590 } elsif ($mod & KMOD_CTRL) {
1517 $self->{ctrl}++; 1591 $self->{ctrl}++;
1518 $::CONN->send ("command run $DIR{$sym}[0]"); 1592 $::CONN->user_send ("command run $DIR{$sym}[0]");
1519 } else { 1593 } else {
1520 $::CONN->send ("command $DIR{$sym}[1]"); 1594 $::CONN->user_send ("command $DIR{$sym}[1]");
1521 } 1595 }
1522 } 1596 }
1523} 1597}
1524 1598
1525sub key_up { 1599sub key_up {
… …
1527 1601
1528 my $mod = $ev->key_mod; 1602 my $mod = $ev->key_mod;
1529 my $sym = $ev->key_sym; 1603 my $sym = $ev->key_sym;
1530 1604
1531 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1605 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1532 $::CONN->send ("command fire_stop"); 1606 $::CONN->user_send ("command fire_stop");
1533 } 1607 }
1534 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1608 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1535 $::CONN->send ("command run_stop"); 1609 $::CONN->user_send ("command run_stop");
1536 } 1610 }
1537} 1611}
1538 1612
1539############################################################################# 1613#############################################################################
1540 1614

Diff Legend

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