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.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

… …
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062 }, 1062 },
1063 ; 1063 ;
1064 1064
1065 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1067 can_events => 1, 1068 can_events => 1,
1068 hslider => $hslider, 1069 hslider => $hslider,
1069 vslider => $vslider, 1070 vslider => $vslider,
1070 col_expand => [1, 0], 1071 col_expand => [1, 0],
1071 row_expand => [1, 0], 1072 row_expand => [1, 0],
1072 %arg, 1073 %arg,
1073 ); 1074 );
1074 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1075 $self->SUPER::add (0, 0, $self->{vp}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078 1083
1079 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1080 1085
1081 $self 1086 $self
1082} 1087}
… …
1090} 1095}
1091 1096
1092sub invoke_mouse_wheel { 1097sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1098 my ($self, $ev) = @_;
1094 1099
1095 return 0 unless $ev->{dy}; # only vertical movements 1100 return 0 unless $ev->{dy}; # only vertical movements for now
1096 1101
1097 $self->{vslider}->emit (mouse_wheel => $ev); 1102 $self->{vslider}->emit (mouse_wheel => $ev);
1098 1103
1099 1 1104 1
1100} 1105}
1101 1106
1102sub update_slider { 1107sub update_slider {
1103 my ($self) = @_; 1108 my ($self) = @_;
1104 1109
1110 my $child = ($self->{vp} or return)->child;
1111
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w}); 1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108 1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h}); 1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2); 1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1112} 1129}
1113 1130
1114sub update { 1131sub update {
1115 my ($self) = @_; 1132 my ($self) = @_;
1116 1133
… …
1500 1517
1501sub new { 1518sub new {
1502 my $class = shift; 1519 my $class = shift;
1503 1520
1504 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1505 col_expand => [], 1523 col_expand => [],
1506 row_expand => [], 1524 row_expand => [],
1507 @_, 1525 @_,
1508 ) 1526 )
1509} 1527}
1510 1528
1511sub children { 1529sub children {
1512 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1513} 1531}
1514 1532
1533# TODO: store row/col info in child widget and use standard add/del
1515sub add { 1534sub add {
1516 my ($self) = shift; 1535 my ($self) = shift;
1517 1536
1518 while (@_) { 1537 while (@_) {
1519 my ($x, $y, $child) = splice @_, 0, 3, (); 1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1520 $child->set_parent ($self); 1539 $child->set_parent ($self);
1521 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1522 } 1541 }
1523 1542
1524 $self->{force_realloc} = 1; 1543 $self->{force_realloc} = 1;
1525 $self->{force_size_alloc} = 1; 1544 $self->{force_size_alloc} = 1;
1526 $self->realloc; 1545 $self->realloc;
1527} 1546}
1528 1547
1529sub remove { 1548sub remove {
1530 my ($self, $child) = @_; 1549 my ($self, $child) = @_;
1531 1550
1532 # TODO: not yet implemented 1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1533} 1556}
1534 1557
1535# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1536sub clear { 1559sub clear {
1537 my ($self) = @_; 1560 my ($self) = @_;
… …
1650 my ($self) = @_; 1673 my ($self) = @_;
1651 1674
1652 for (grep $_, @{$self->{children}}) { 1675 for (grep $_, @{$self->{children}}) {
1653 $_->draw for grep $_, @$_; 1676 $_->draw for grep $_, @$_;
1654 } 1677 }
1678}
1679
1680#############################################################################
1681
1682package CFPlus::UI::Fixed;
1683
1684use List::Util qw(min max);
1685
1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1655} 1760}
1656 1761
1657############################################################################# 1762#############################################################################
1658 1763
1659package CFPlus::UI::Box; 1764package CFPlus::UI::Box;
… …
3319 3424
3320sub new { 3425sub new {
3321 my $class = shift; 3426 my $class = shift;
3322 3427
3323 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
3324 aspect => 1, 3431 aspect => 1,
3325 can_events => 0, 3432 can_events => 0,
3326 @_, 3433 @_,
3327 ); 3434 );
3328 3435
… …
3332 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3334 hard => 1, 3441 hard => 1,
3335 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
3336 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
3337 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
3338 $widget->update; 3448 $self->update;
3339 }, 3449 },
3340 ); 3450 );
3451
3452 $self->update_face;
3341 } 3453 }
3342 3454
3343 $self 3455 $self
3344} 3456}
3345 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
3346sub size_request { 3471sub size_request {
3347 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
3348} 3487}
3349 3488
3350sub update { 3489sub update {
3351 my ($self) = @_; 3490 my ($self) = @_;
3352 3491
… …
3360 3499
3361 return unless $::CONN; 3500 return unless $::CONN;
3362 3501
3363 $self->SUPER::_draw; 3502 $self->SUPER::_draw;
3364 3503
3365 my $face;
3366
3367 if ($self->{frame}) {
3368 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
3369 3505 or return;
3370 $face = $anim->[ $self->{frame} % @$anim ]
3371 if $anim && @$anim;
3372 }
3373 3506
3374 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
3375 3508
3376 if ($tex) { 3509 if ($tex) {
3377 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
3378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3379 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;

Diff Legend

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