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.100 by elmex, Fri Apr 14 11:32:22 2006 UTC vs.
Revision 1.103 by elmex, Fri Apr 14 13:51:36 2006 UTC

… …
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) { 1095 } elsif ($sym == SDLK_HOME) {
1096 $self->{cursor} = 0; 1096 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) { 1097 } elsif ($sym == SDLK_END) {
1098 $self->{cursor} = length $text; 1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1099 } elsif ($uni) { 1101 } elsif ($uni) {
1100 substr $text, $self->{cursor}++, 0, chr $uni; 1102 substr $text, $self->{cursor}++, 0, chr $uni;
1101 } 1103 }
1102 1104
1103 $self->_set_text ($text); 1105 $self->_set_text ($text);
… …
1253 1255
1254package CFClient::UI::CheckBox; 1256package CFClient::UI::CheckBox;
1255 1257
1256our @ISA = CFClient::UI::DrawBG::; 1258our @ISA = CFClient::UI::DrawBG::;
1257 1259
1260my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263
1258use SDL; 1264use SDL;
1259use SDL::OpenGL; 1265use SDL::OpenGL;
1260 1266
1261sub new { 1267sub new {
1262 my $class = shift; 1268 my $class = shift;
… …
1299 $self->SUPER::_draw; 1305 $self->SUPER::_draw;
1300 1306
1301 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1307 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1302 1308
1303 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1309 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1304 1310
1305 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1311 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1306 1312
1307 glBegin GL_LINE_LOOP; 1313 glEnable GL_BLEND;
1308 glVertex 0 , 0; 1314 glEnable GL_TEXTURE_2D;
1309 glVertex 0 , $s; 1315 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glVertex $s, $s;
1311 glVertex $s, 0;
1312 glEnd;
1313 1316
1314 if ($self->{state}) { 1317 my $tex = $self->{state} ? $tex[1] : $tex[0];
1315 glBegin GL_LINES; 1318
1316 glVertex 0 , 0; 1319 $tex->draw_quad (0, 0, $s, $s);
1317 glVertex $s, $s; 1320
1318 glVertex $s, 0; 1321 glDisable GL_TEXTURE_2D;
1319 glVertex 0 , $s; 1322 glDisable GL_BLEND;
1320 glEnd;
1321 }
1322} 1323}
1323 1324
1324############################################################################# 1325#############################################################################
1325 1326
1326package CFClient::UI::Slider; 1327package CFClient::UI::Slider;
… …
1349 range => [0, 0, 100, 10], 1350 range => [0, 0, 100, 10],
1350 req_w => 40, 1351 req_w => 40,
1351 req_h => 13, 1352 req_h => 13,
1352 vertical => 0, 1353 vertical => 0,
1353 can_hover => 1, 1354 can_hover => 1,
1355 inner_pad => 5,
1354 @_ 1356 @_
1355 ); 1357 );
1356 1358
1357 $self 1359 $self
1358} 1360}
… …
1379 if ($GRAB == $self) { 1381 if ($GRAB == $self) {
1380 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1381 1383
1382 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1383 1385
1386 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1387 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1388
1389 $x -= $inner_pad_px; # substract the padding
1384 $x = $x * ($hi - $lo) / $w + $lo; 1390 $x = $x * ($hi - $lo) / $inner_w + $lo;
1385 $x = $lo if $x < $lo; 1391 $x = $lo if $x < $lo;
1386 $x = $hi - $page if $x > $hi - $page; 1392 $x = $hi - $page if $x > $hi - $page;
1387 $self->{range}[0] = $x; 1393 $self->{range}[0] = $x;
1388 1394
1389 $self->emit (changed => $x); 1395 $self->emit (changed => $x);
1390 $self->update; 1396 $self->update;
1391 } 1397 }
1398}
1399
1400# the inner_* stuff is for generating a padding for the slider handle,
1401# so that the handle doesn't leave the texture. This calculation isn't 100%
1402# correct propably, but it does the job for now
1403sub _calc_inner_pad_px {
1404 my ($self, $w) = @_;
1405 ($w / 100) * $self->{inner_pad} # % to pixels
1392} 1406}
1393 1407
1394sub _draw { 1408sub _draw {
1395 my ($self) = @_; 1409 my ($self) = @_;
1396 1410
… …
1410 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1411 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1412 1426
1413 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1427 my ($value, $lo, $hi, $page) = @{$self->{range}};
1414 1428
1415 # the inner_* stuff is for generating a padding for the slider handle, 1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1416 # so that the handle doesn't leave the texture. This calculation isn't 100%
1417 # correct propably, but it does the job for now
1418 my $inner_pad = 5; # 5% of width for slider bg texture border
1419 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1420 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1421 1431
1422 $page = int $page * $inner_w / ($hi - $lo); 1432 $page = int $page * $inner_w / ($hi - $lo);
1423 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1424 1434
1425 $w -= $page; 1435 $w -= $page;
… …
1650 1660
1651 if ($sym == SDLK_KP5) { 1661 if ($sym == SDLK_KP5) {
1652 $::CONN->user_send ("command stay fire"); 1662 $::CONN->user_send ("command stay fire");
1653 } elsif ($sym == SDLK_a) { 1663 } elsif ($sym == SDLK_a) {
1654 $::CONN->user_send ("command apply"); 1664 $::CONN->user_send ("command apply");
1665 } elsif ($sym == SDLK_QUOTE) {
1666 $self->emit ('activate_console');
1655 } elsif (exists $DIR{$sym}) { 1667 } elsif (exists $DIR{$sym}) {
1656 if ($mod & KMOD_SHIFT) { 1668 if ($mod & KMOD_SHIFT) {
1657 $self->{shft}++; 1669 $self->{shft}++;
1658 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 1670 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1659 } elsif ($mod & KMOD_CTRL) { 1671 } elsif ($mod & KMOD_CTRL) {

Diff Legend

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